Commit summary forthcoming

kputnam · Sep 11, 2019 · e64b6d2 · e64b6d2
1 parent 99bfef9
commit e64b6d2
Show file tree

Hide file tree

Showing 37 changed files with 641 additions and 449 deletions.
diff --git a/.simplecov b/.simplecov
@@ -1,5 +1,4 @@
 require "base64"
-require "simplecov-inline-html"
 require "term/ansicolor"
 
 SimpleCov.start do
@@ -57,89 +56,95 @@ class SimpleCov::Formatter::SummaryFormatter
   end
 end
 
-class SimpleCov::Formatter::CustomHtmlFormatter < SimpleCov::Formatter::InlineHTMLFormatter
-  def output_message(result)
-  end
+begin
+  require "simplecov-inline-html"
+
+  class SimpleCov::Formatter::CustomHtmlFormatter < SimpleCov::Formatter::InlineHTMLFormatter
+    def output_message(result)
+    end
 
-  # This image is missing from simplecov-inline-html
-  BORDER = <<-EOF.gsub(/\s/, '')
-    iVBORw0KGgoAAAANSUhEUgAAAAEAAABLCAIAAAA+tHrUAAAAUklEQVR4AcXH
-    sQ3AIAwFUfuDYADSMQkrMiVdqKGzLDnCRTaIUjzpjnvvodaKtRbM7KWqTkT4
-    PBF9Yu+NMQauUvx/Eu45Q0oJOWd3OsbomBmttQc0NiOlCz/4pgAAAABJRU5E
-    rkJggg==
-  EOF
+    # This image is missing from simplecov-inline-html
+    BORDER = <<-EOF.gsub(/\s/, '')
+      iVBORw0KGgoAAAANSUhEUgAAAAEAAABLCAIAAAA+tHrUAAAAUklEQVR4AcXH
+      sQ3AIAwFUfuDYADSMQkrMiVdqKGzLDnCRTaIUjzpjnvvodaKtRbM7KWqTkT4
+      PBF9Yu+NMQauUvx/Eu45Q0oJOWd3OsbomBmttQc0NiOlCz/4pgAAAABJRU5E
+      rkJggg==
+    EOF
 
-  # This image is missing from simplecov-inline-html
-  CONTROLS = <<-EOF.gsub(/\s/, '')
-    iVBORw0KGgoAAAANSUhEUgAAAOEAAABLCAMAAACx6hDAAAABj1BMVEVPT0/e
-    3t7b29vS0tK7urq5uLjq6uqZmZmSkpJaWlrU1NTj4+PFxcWvr6+goKBbW1u3
-    t7c9PT27u7vCwsKsrKxiYWGqqqq5ublbWlpeXV2Xl5fExMSbmpq6ubmNjY18
-    fHzy8vIrKystLS0sLCxNTU0uLi4wMDDNzc05OTns6+vl5eUvLy/q6ekqKipM
-    TExDQ0M4ODgyMjI2NjbZ2dk6OjrY2NjMzMxLS0vAwMBCQkLo5+dHR0cxMTFK
-    SkpBQUHv7u43NzdISEhFRUVRUVHx8fE7Ozs8PDwzMzNJSUnp6elGRkZQUFDr
-    6upeXl7t7e1gYGCoqKjv7+81NTWKiorn5uZERESCgoJdXV3p6OhOTk51dXVA
-    QEA+Pj6np6fu7e2+vr5cXFxSUlKJiYnOzs7s7OxTU1P29vbw8PB2dnZfX1/m
-    5eV4eHifn59qamqmpqbQ0NCOjo7Kysqzs7P4+PiDg4Otra3z8/M/Pz80NDSr
-    q6u/v7/Pz890dHRpaWmBgYH5+fn08/NoaGjPzs7///+ioqIRuwm9AAAGF0lE
-    QVR4AcTWd1PDNhQAcH8UDcszdvaOs0lCSNiQsCmjhe7d654fvE+y8QjGXAq+
-    vj+iu+enO/0iPdnSwdrx18f/YxzsfDDYkqrNtvp3Ynw1LrWbVWlrcCMdfLaz
-    XkSFh/rms1Vs6nFry+jBnEy0/DAWs414dPzxvwphynoRES6HBlpdWQOVh42Y
-    9RpetjEsou3QfwQPlnH/yO9XPD78wxs77yMcxMdLQh19vo9Wl7dE+zWUWQUa
-    UqECRA6sFE5DRCj/Gs2eC/XvMaUUX33jjejNQi7Zeilc56rwEh1bVozQsr7k
-    hCgQ4y4QObCLLSCGy39DlzFCSgihIBTjm4VcJyWFYEaEjT1jQSmOEWJMfzX2
-    Qt01AyClRFOHmaGqEZj1C8qEyxfGXuOZkDDGCAjF+Eah8J3Iss2jGg1bhCwD
-    EoiBENaaI4zQGCGF/KAS6i69XMCQZCUVqSUGk3ChPIuU9yvDzVSF3Gc7k14z
-    Pnq9iWPLnOgL79AuYaZpMiRi2zu2IgjP5y5QcHvC0aRQrYx2Rgo8o3Bggz9E
-    lNMLdJeekANtpzc9ytbbsVHPHk17VSD6wo7xAEBFUcz7+XxxfWpkxGH883ox
-    n9+LPCPHQXdB9+WIqbR4KCbJQUcGQq/8AXVWhaYnNN9BKDvN75Jm/Fjvu0QQ
-    igt/wIHugvmp+0nni6pZVKRFnpFQdwFRM1t5CJighYAgfCofGB810hGKLez9
-    kzzl03Z/YnvCJarxQ6fwFbtEXHOFWKS9vDiMhz5R3Wjlx+NxvrWhAjAs9Mtr
-    8CAQMk/I3kMoO9MvkqfcnmebjuwK9aKFCQMgrDcfFRIX7uYJtoJezKBHT/gJ
-    3KNhYai8rKckhC3M/pw8RS2d9R1Z8vcQKCCJ38M8j5g9VMQDZXUPRdbfw3RO
-    6Um1Wb99RZg7P5rYILx56kO/33gf1qJ9KODRPlRL/k2jqdE+9MoHxdT6UDqp
-    TtuvCCuFUZY3ohCKuxSIobt0FrlLW/CAfBu5SzWgu2EyLXqXivIU71J+0Tj9
-    s9eE+6N6z+ZTEt6HHSRC5LXdyPswRxikNx7hBzY9F34finKym9770BX+sKaQ
-    f9NoLOGbRg19pOjFLiYQmopUjUDgbnHlm+bf9u33tWkgjAP4VvUak251/v79
-    RCashUBhTGQV1zBtVLoX3dy0s0OmDETfGmhfCv3HzZPlSp7suKPFcL153zfZ
-    2BH2IT/unnAPDi9ZuKEQjrtcqF6XrgvXpevJlQuSq4mlwhc/yA8Xr0sTOQrx
-    qEU4W23Ry9cWzwq1xSd1baFHSOtDWcGH5VM4rQ/DeepDDULMh7lq/Bfz1vga
-    hPq/05Qr1BArtML/UGjfNIO3TDBbeMLZgk1nC4/OFkw8W0yWMZM/2bGjacav
-    xYIZP964OOMzJ65kM34l7iNRMhzTnABm+Xd21LRqWwEQCAFuIIECAZCYAgGQ
-    mBu+4n9dRGF7n1UBxEJYZWTljcCUGKRAJAb54VW23144If9fxUJwKvnqycOh
-    SPQr2U/eHhn+EYeXLHzkS3OrIDzza5BG8EX43FDLV8AcVoWMmquAIU3NPytZ
-    ePuKNHepsMP6cB6nmqTPgvRmXMVfHMCQp6vNiVNguyiEvt8pV3j1lzTXckJ8
-    4TtA4qZfolwgwaeLEimQCsHxfrQXRDjw3RgUQk45pEQKpEKIXf4H3cKmB6AQ
-    8uS/COMzSN+jRIjxmpf+Gh5e7ueQ6X0OFe/SPfPfpf9oPozp7UvnQ73C2dc0
-    g9nXNFqF5q9L1UJ9tYUGoaI+dP1Af304u1B/ja9DqOs7TflCDTFCaIVWaIVW
-    aIVWaIVWaIVWaIVDlfAgMlTI95eqhPc2oxYKvxkp7OEO2pvyUz8JcY+wsULc
-    5+3IT/20MeL7vE0ULj1/vzt8LDvzwzDaxr36xgqTreytk607Pz+f1u9fL6Re
-    P31wEkZD7LcwVJjepq9ftUZRY3P87mLGB2EjGh4ll9Bg4RISj3ZGa93uVjHd
-    brQ22uFAI4WK1i7s69rFxq7j3htzhfL2vKQ37yU25+ElNFJIWiwxgv7KY95g
-    aaaQG3vyHlkEmitEI0bV52yikOe7KnygYcK/0sK5wtrjpuMAAAAASUVORK5C
-    YII=
-  EOF
+    # This image is missing from simplecov-inline-html
+    CONTROLS = <<-EOF.gsub(/\s/, '')
+      iVBORw0KGgoAAAANSUhEUgAAAOEAAABLCAMAAACx6hDAAAABj1BMVEVPT0/e
+      3t7b29vS0tK7urq5uLjq6uqZmZmSkpJaWlrU1NTj4+PFxcWvr6+goKBbW1u3
+      t7c9PT27u7vCwsKsrKxiYWGqqqq5ublbWlpeXV2Xl5fExMSbmpq6ubmNjY18
+      fHzy8vIrKystLS0sLCxNTU0uLi4wMDDNzc05OTns6+vl5eUvLy/q6ekqKipM
+      TExDQ0M4ODgyMjI2NjbZ2dk6OjrY2NjMzMxLS0vAwMBCQkLo5+dHR0cxMTFK
+      SkpBQUHv7u43NzdISEhFRUVRUVHx8fE7Ozs8PDwzMzNJSUnp6elGRkZQUFDr
+      6upeXl7t7e1gYGCoqKjv7+81NTWKiorn5uZERESCgoJdXV3p6OhOTk51dXVA
+      QEA+Pj6np6fu7e2+vr5cXFxSUlKJiYnOzs7s7OxTU1P29vbw8PB2dnZfX1/m
+      5eV4eHifn59qamqmpqbQ0NCOjo7Kysqzs7P4+PiDg4Otra3z8/M/Pz80NDSr
+      q6u/v7/Pz890dHRpaWmBgYH5+fn08/NoaGjPzs7///+ioqIRuwm9AAAGF0lE
+      QVR4AcTWd1PDNhQAcH8UDcszdvaOs0lCSNiQsCmjhe7d654fvE+y8QjGXAq+
+      vj+iu+enO/0iPdnSwdrx18f/YxzsfDDYkqrNtvp3Ynw1LrWbVWlrcCMdfLaz
+      XkSFh/rms1Vs6nFry+jBnEy0/DAWs414dPzxvwphynoRES6HBlpdWQOVh42Y
+      9RpetjEsou3QfwQPlnH/yO9XPD78wxs77yMcxMdLQh19vo9Wl7dE+zWUWQUa
+      UqECRA6sFE5DRCj/Gs2eC/XvMaUUX33jjejNQi7Zeilc56rwEh1bVozQsr7k
+      hCgQ4y4QObCLLSCGy39DlzFCSgihIBTjm4VcJyWFYEaEjT1jQSmOEWJMfzX2
+      Qt01AyClRFOHmaGqEZj1C8qEyxfGXuOZkDDGCAjF+Eah8J3Iss2jGg1bhCwD
+      EoiBENaaI4zQGCGF/KAS6i69XMCQZCUVqSUGk3ChPIuU9yvDzVSF3Gc7k14z
+      Pnq9iWPLnOgL79AuYaZpMiRi2zu2IgjP5y5QcHvC0aRQrYx2Rgo8o3Bggz9E
+      lNMLdJeekANtpzc9ytbbsVHPHk17VSD6wo7xAEBFUcz7+XxxfWpkxGH883ox
+      n9+LPCPHQXdB9+WIqbR4KCbJQUcGQq/8AXVWhaYnNN9BKDvN75Jm/Fjvu0QQ
+      igt/wIHugvmp+0nni6pZVKRFnpFQdwFRM1t5CJighYAgfCofGB810hGKLez9
+      kzzl03Z/YnvCJarxQ6fwFbtEXHOFWKS9vDiMhz5R3Wjlx+NxvrWhAjAs9Mtr
+      8CAQMk/I3kMoO9MvkqfcnmebjuwK9aKFCQMgrDcfFRIX7uYJtoJezKBHT/gJ
+      3KNhYai8rKckhC3M/pw8RS2d9R1Z8vcQKCCJ38M8j5g9VMQDZXUPRdbfw3RO
+      6Um1Wb99RZg7P5rYILx56kO/33gf1qJ9KODRPlRL/k2jqdE+9MoHxdT6UDqp
+      TtuvCCuFUZY3ohCKuxSIobt0FrlLW/CAfBu5SzWgu2EyLXqXivIU71J+0Tj9
+      s9eE+6N6z+ZTEt6HHSRC5LXdyPswRxikNx7hBzY9F34finKym9770BX+sKaQ
+      f9NoLOGbRg19pOjFLiYQmopUjUDgbnHlm+bf9u33tWkgjAP4VvUak251/v79
+      RCashUBhTGQV1zBtVLoX3dy0s0OmDETfGmhfCv3HzZPlSp7suKPFcL153zfZ
+      2BH2IT/unnAPDi9ZuKEQjrtcqF6XrgvXpevJlQuSq4mlwhc/yA8Xr0sTOQrx
+      qEU4W23Ry9cWzwq1xSd1baFHSOtDWcGH5VM4rQ/DeepDDULMh7lq/Bfz1vga
+      hPq/05Qr1BArtML/UGjfNIO3TDBbeMLZgk1nC4/OFkw8W0yWMZM/2bGjacav
+      xYIZP964OOMzJ65kM34l7iNRMhzTnABm+Xd21LRqWwEQCAFuIIECAZCYAgGQ
+      mBu+4n9dRGF7n1UBxEJYZWTljcCUGKRAJAb54VW23144If9fxUJwKvnqycOh
+      SPQr2U/eHhn+EYeXLHzkS3OrIDzza5BG8EX43FDLV8AcVoWMmquAIU3NPytZ
+      ePuKNHepsMP6cB6nmqTPgvRmXMVfHMCQp6vNiVNguyiEvt8pV3j1lzTXckJ8
+      4TtA4qZfolwgwaeLEimQCsHxfrQXRDjw3RgUQk45pEQKpEKIXf4H3cKmB6AQ
+      8uS/COMzSN+jRIjxmpf+Gh5e7ueQ6X0OFe/SPfPfpf9oPozp7UvnQ73C2dc0
+      g9nXNFqF5q9L1UJ9tYUGoaI+dP1Af304u1B/ja9DqOs7TflCDTFCaIVWaIVW
+      aIVWaIVWaIVWaIVDlfAgMlTI95eqhPc2oxYKvxkp7OEO2pvyUz8JcY+wsULc
+      5+3IT/20MeL7vE0ULj1/vzt8LDvzwzDaxr36xgqTreytk607Pz+f1u9fL6Re
+      P31wEkZD7LcwVJjepq9ftUZRY3P87mLGB2EjGh4ll9Bg4RISj3ZGa93uVjHd
+      brQ22uFAI4WK1i7s69rFxq7j3htzhfL2vKQ37yU25+ElNFJIWiwxgv7KY95g
+      aaaQG3vyHlkEmitEI0bV52yikOe7KnygYcK/0sK5wtrjpuMAAAAASUVORK5C
+      YII=
+    EOF
 
-  def file(path)
-    if path.end_with?("application.css")
-      css = super(path)
-      css.gsub!("url(colorbox/border.png)", "url(data:image/png;base64,#{BORDER})")
-      css.gsub!("url(colorbox/controls.png)", "url(data:image/png;base64,#{CONTROLS})")
+    def file(path)
+      if path.end_with?("application.css")
+        css = super(path)
+        css.gsub!("url(colorbox/border.png)", "url(data:image/png;base64,#{BORDER})")
+        css.gsub!("url(colorbox/controls.png)", "url(data:image/png;base64,#{CONTROLS})")
 
-      # Fit more stuff without scroll bars, don't linewrap filenames
-      css << <<-EOF
-        body       { padding:0 !important; }
-        .src_link  { white-space:nowrap; }
-        .file_list { font-size: .8rem; }
-        .ui-icon   { width:0px !important; height:0px !important; }
-        th         { font-size:.7rem; overflow:hidden; white-space:normal !important; }
-      EOF
-    else
-      super(path)
+        # Fit more stuff without scroll bars, don't linewrap filenames
+        css << <<-EOF
+          body       { padding:0 !important; }
+          .src_link  { white-space:nowrap; }
+          .file_list { font-size: .8rem; }
+          .ui-icon   { width:0px !important; height:0px !important; }
+          th         { font-size:.7rem; overflow:hidden; white-space:normal !important; }
+        EOF
+      else
+        super(path)
+      end
     end
   end
-end
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-  SimpleCov::Formatter::SummaryFormatter,
-  SimpleCov::Formatter::CustomHtmlFormatter
-])
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
+    SimpleCov::Formatter::SummaryFormatter,
+    SimpleCov::Formatter::CustomHtmlFormatter
+  ])
+rescue LoadError
+  SimpleCov.formatter = SimpleCov::Formatter::SummaryFormatter
+end
diff --git a/.travis.yml b/.travis.yml
@@ -9,13 +9,14 @@ before_install:
     else
       gem update --system;
       gem install bundler;
+      bundle install;
       bundle update --bundler;
     fi
 
 os:
   - osx
   - linux
-  - windows
+  # windows
 
 rvm:
   # 2.0.0

diff --git a/Gemfile b/Gemfile
@@ -8,4 +8,14 @@ gemspec(path: "build/gemspec", name: "stupidedi-exts")
 group :development do
   gem "yard",      "= 0.9.16"
   gem "rdiscount", "~> 2.2"
+
+  gem "irb"#                       "~> 1.0"
+  gem "rake",                      "~> 12.3"
+  gem "rspec",                     "~> 3.8"
+  gem "rspec-collection_matchers"# " "
+  gem "stackprof",                 "~> 0.2"
+  gem "benchmark-ips"#             ""
+  gem "simplecov"#                 ""
+  gem "simplecov-inline-html"      if RUBY_VERSION >= "2.4"
+  gem "memory_profiler"#           if RUBY_VERSION >= "2.4"
 end
diff --git a/build/doc/lib/rspec-plugin/Rakefile b/build/doc/lib/rspec-plugin/Rakefile
@@ -17,7 +17,7 @@ Rake::GemPackageTask.new(SPEC) do |pkg|
 end
 
 desc "Install the gem locally"
-task :install => :package do 
+task :install => :package do
   sh "#{SUDO} gem install pkg/#{SPEC.name}-#{SPEC.version}.gem --local --no-rdoc --no-ri"
   sh "rm -rf pkg/yard-#{SPEC.version}" unless ENV['KEEP_FILES']
 end

diff --git a/build/doc/lib/rspec-plugin/example/example_code.rb b/build/doc/lib/rspec-plugin/example/example_code.rb
@@ -8,9 +8,9 @@ def pig_latin
   end
 end
 
-# 
+#
 # Specs
-# 
+#
 describe String do
   describe '#pig_latin' do
     it "should be a pig!" do
@@ -21,4 +21,4 @@ def pig_latin
       "hello".pig_latin.should == "hello"
     end
   end
-end
+end
diff --git a/build/doc/lib/rspec-plugin/lib/yard-rspec/handler.rb b/build/doc/lib/rspec-plugin/lib/yard-rspec/handler.rb
@@ -1,6 +1,6 @@
 class RSpecDescribeHandler < YARD::Handlers::Ruby::Base
   handles method_call(:describe)
-  
+
   def process
     return unless statement.last.last
 
@@ -51,7 +51,7 @@ class RSpecItHandler < YARD::Handlers::Ruby::Base
   handles method_call(:it)
   handles method_call(:its)
   handles method_call(:specify)
-  
+
   def process
     return unless owner.is_a?(Hash)
     return unless owner[:describes]

diff --git a/build/doc/lib/rspec-plugin/lib/yard-rspec/legacy.rb b/build/doc/lib/rspec-plugin/lib/yard-rspec/legacy.rb
@@ -2,7 +2,7 @@ class LegacyRSpecDescribeHandler < YARD::Handlers::Ruby::Legacy::Base
   # @todo deal with rspec metadata hash params
   MATCH = /\Adescribe\s+(.+?)\s+(?:do|\{)/
   handles MATCH
-  
+
   def process
     describes = statement.tokens.to_s[MATCH, 1].gsub(/["']/, '')
 
@@ -42,7 +42,7 @@ class LegacyRSpecItHandler < YARD::Handlers::Ruby::Legacy::Base
 
   handles MATCH
   handles /\A(?:its?|specify)\s+(?:do|\{)/
-  
+
   def process
     return unless owner.is_a?(Hash)
     return unless owner[:describes]

diff --git a/build/gemspec/stupidedi-core.gemspec b/build/gemspec/stupidedi-core.gemspec
@@ -34,15 +34,4 @@ Gem::Specification.new do |s|
   s.required_ruby_version     = ">= 2.0.0"
   s.required_rubygems_version = ">= 2.5.0"
   s.requirements              # << ""
-
-  # Development dependencies
-  s.add_development_dependency "irb"#                       "~> 1.0"
-  s.add_development_dependency "rake",                      "~> 12.3"
-  s.add_development_dependency "rspec",                     "~> 3.8"
-  s.add_development_dependency "rspec-collection_matchers"# " "
-  s.add_development_dependency "simplecov"#                 ""
-  s.add_development_dependency "simplecov-inline-html"#     ""        # requires ruby 2.4+
-  s.add_development_dependency "stackprof",                 "~> 0.2"
-  s.add_development_dependency "benchmark-ips"#             ""
-  s.add_development_dependency "memory_profiler"#           ""        # requires ruby 2.3+
 end
diff --git a/ext/c/stupidedi/reader/extconf.rb b/ext/c/stupidedi/reader/extconf.rb
@@ -1,7 +1,8 @@
 require "mkmf"
 
-extension_name = "stupidedi/reader/native_ext"
+$warnflags.gsub!(/-Wdeclaration-after-statement/, "")
+$CFLAGS << " -std=c99"
 
+extension_name = "stupidedi/reader/native_ext"
 dir_config      extension_name
 create_makefile extension_name
-create_header