smarter_bundler 0.1.0 → 0.1.1

data/.travis.yml

@@ -23,13 +23,27 @@ matrix:
     - rvm: 1.8.7
       env: RUBYGEMS_VERSION=1.8.25
 
+    - rvm: 1.9.2
+
     - rvm: 1.9.3
 
-    - rvm: 2.2.1
+    - rvm: 2.0.0
+
+    - rvm: 2.1.0
+
+    - rvm: 2.1.10
+
+    - rvm: 2.2.0
+
+    - rvm: 2.2.2
 
     - rvm: 2.2.9
 
+    - rvm: 2.3.0
+
     - rvm: 2.3.6
 
+    - rvm: 2.4.0
+
     - rvm: 2.4.3
 

data/bin/test

@@ -56,6 +56,9 @@ do
         cp -f Gemfile.default Gemfile
         # Exclude debugger - it breaks for many varied reasons on travis
         ../../exe/smarter_bundle  --without debug
+        echo Gemfile changes:
+        diff Gemfile.default Gemfile
+        echo
         bundle exec ruby -e 'puts "Test of #{ENV['"'"'d'"'"']}/Gemfile with ruby #{RUBY_VERSION} passed at #{Time.now}!"'
   )
 done

data/lib/smarter_bundler/bundle.rb

@@ -5,6 +5,14 @@ module SmarterBundler
   class Bundle
     include SmarterBundler::Shell
 
+    KNOWN_ISSUES_192 = {
+       'unicorn' => '5.0',
+       #'nokogiri' => '1.6.0',
+       'jbuilder' => '2.0.0',
+     }
+
+
+
     def run(bundle_args)
       puts "Smarter Bundler will recursively install your gems and output the successful bundler output. This may take a while."
       count = 0
@@ -20,9 +28,13 @@ module SmarterBundler
             exit 1
           end
           previous_failure = failed_gem_and_version
-          if install_failed_gem failed_gem_and_version
+          gem, version = *failed_gem_and_version
+          if install_failed_gem gem, version
             puts "Retrying seems to have fixed the problem"
-          elsif ruby_version_clash(result) && gemfile.restrict_gem_version(*failed_gem_and_version)
+          elsif gemfile.restrict_gem_version(gem, known_issues(gem))
+            gemfile.save
+            count += 1
+          elsif ruby_version_clash(result) && gemfile.restrict_gem_version(gem, version)
             gemfile.save
             count += 1
           else
@@ -41,14 +53,22 @@ module SmarterBundler
       shell "bundle #{bundle_args}"
     end
 
-    def install_failed_gem(failed_gem_and_version)
-      shell? "gem install '#{failed_gem_and_version[0]}' -v '#{failed_gem_and_version[1]}'"
+    def install_failed_gem(gem, version)
+      shell? "gem install '#{gem}' -v '#{version}'"
     end
 
     def ruby_version_clash(result)
       result.output.select{|l| l =~ /requires Ruby version/}.any?
     end
 
+    def known_issues(gem)
+      if RUBY_VERSION < '1.9.3'
+        KNOWN_ISSUES_192[gem]
+      else
+        nil
+      end
+    end
+
     def parse_output(result)
       result.output.each do |line|
         if line =~ /Make sure that `gem install (\S+) -v '(\S+)'`/

data/lib/smarter_bundler/gemfile.rb

@@ -15,19 +15,22 @@ module SmarterBundler
     end
 
     def restrict_gem_version gem, version_limit
+      return false unless version_limit.to_s =~ /\d\.\d/
       if @contents.select{|line| line =~ /^\s*gem\s+['"]#{gem}['"]/}.empty?
         @contents << "gem '#{gem}', '>=0'"
       end
       adjusted = false
       @contents.map! do |line|
-        if line =~ /^(\s*gem\s+['"]#{gem}['"])(\s*,\*['"]([^'"]*)['"])?(.*)$/
+        if line =~ /^(\s*gem\s+['"]#{gem}['"])(\s*,\*['"]([^'"]*)['"])?(.*?)$/
           gem_and_name = $1
           rest_of_line = $4
           version = $3.to_s
+          puts "Found #{gem_name_name} with version spec: #{version} and other args: #{rest_of_line}"
           new_version = version.sub(/<=?\s*[^,\s]+/, '').sub(/^\s*,\s*/, '').sub(/\s*,\s*$/, '') + (version == '' ? '' : ', ') + "< #{version_limit}"
+          puts "  Calculated new_version spec: #{new_version}"
           if new_version != version
             @changed = true
-            rest_of_line.sub(/#.*/, '')
+            rest_of_line.sub!(/  # REQUIRED - Added by SmarterBundler.*/, '')
             rest_of_line << '  # REQUIRED - Added by SmarterBundler'
             line = "#{gem_and_name}, '#{new_version}'#{rest_of_line}"
             puts "Changed Gemfile line to: #{line}"

data/lib/smarter_bundler/shell.rb

@@ -18,5 +18,6 @@ module SmarterBundler
       result = shell(command)
       result.status.success?
     end
+
   end
 end

data/lib/smarter_bundler/version.rb

@@ -1,3 +1,3 @@
 module SmarterBundler
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smarter_bundler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -99,16 +99,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1256460857645242723
+      hash: 1603618397689055998
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1256460857645242723
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2