smarter_bundler 0.1.1 → 0.1.2

data/bin/test

@@ -44,21 +44,28 @@ if [ -n "$psych_ver" ]; then
         fi
 fi
 
+if [ $# -gt 0 ]; then
+  dirs="$*"
+fi
 unset BUNDLE_GEMFILE
 for d in $dirs
 do
-  (
-        echo "======================================================================"
-        echo "Testing test/$d/Gemfile using ruby $ruby_version ..."
-        export d
-        cd test/$d
-        rm -f Gemfile.lock
-        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}!"'
-  )
+  if [ -s "test/$d/Gemfile.default" ] ; then
+    (
+          echo "======================================================================"
+          echo "Testing test/$d/Gemfile using ruby $ruby_version ..."
+          export d
+          cd test/$d
+          rm -f Gemfile.lock
+          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}!"'
+    )
+  else
+    echo "Missing: test/$d/Gemfile.default - skipped"
+  fi
 done

data/lib/smarter_bundler/bundle.rb

@@ -1,4 +1,7 @@
 require 'fileutils'
+require 'net/https'
+require 'uri'
+require 'yaml'
 
 module SmarterBundler
 
@@ -6,18 +9,19 @@ module SmarterBundler
     include SmarterBundler::Shell
 
     KNOWN_ISSUES_192 = {
-       'unicorn' => '5.0',
-       #'nokogiri' => '1.6.0',
-       'jbuilder' => '2.0.0',
-     }
-
+        'unicorn' => '5.0',
+        'nokogiri' => '1.6.0',
+        'jbuilder' => '2.0.0',
+        'factory_girl' => '3.0',
+        'factory_bot' => '3.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
       gemfile = SmarterBundler::Gemfile.new
-      previous_failure = [ ]
+      previous_failure = []
       result = nil
       while count < 100
         result = call_bundle(bundle_args)
@@ -29,11 +33,14 @@ module SmarterBundler
           end
           previous_failure = failed_gem_and_version
           gem, version = *failed_gem_and_version
-          if install_failed_gem gem, version
+          if !ruby_version_clash(result) && install_failed_gem(gem, version)
             puts "Retrying seems to have fixed the problem"
           elsif gemfile.restrict_gem_version(gem, known_issues(gem))
             gemfile.save
             count += 1
+          elsif ruby_version_clash(result) && gemfile.restrict_gem_version(gem, rubygems_earlier_version(gem, version))
+            gemfile.save
+            count += 1
           elsif ruby_version_clash(result) && gemfile.restrict_gem_version(gem, version)
             gemfile.save
             count += 1
@@ -58,7 +65,7 @@ module SmarterBundler
     end
 
     def ruby_version_clash(result)
-      result.output.select{|l| l =~ /requires Ruby version/}.any?
+      result.output.select { |l| l =~ /requires Ruby version/ }.any?
     end
 
     def known_issues(gem)
@@ -78,6 +85,81 @@ module SmarterBundler
       nil
     end
 
+    def rubygems_earlier_version(gem, version)
+      @rubygems_cache = {}
+      @platforms ||= begin
+        if RUBY_PLATFORM =~ /linux/
+          ['', 'ruby', 'mri']
+        else
+          [RUBY_PLATFORM]
+        end
+      end
+      @rubygems_cache[gem] ||= begin
+        url = "https://rubygems.org/api/v1/versions/#{gem}.yaml"
+
+        uri = URI.parse(url)
+        req = Net::HTTP::Get.new(uri.request_uri)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = (uri.scheme == 'https')
+        response = http.request(req)
+
+        text = response.body
+        list = YAML.load(text)
+        # puts "Request returned list: #{list.inspect}"
+        list = list.select { |h| @platforms.include?(h['platform'].to_s) && !h['prerelease'] }.map do |h|
+          h.reject do |k, v|
+            %w{authors built_at created_at description downloads_count metadata summary rubygems_version licenses requirements sha}.include? k
+          end
+        end
+        # puts "Trimmed prerelease list: #{list.inspect}"
+        list
+      # rescue RuntimeError => ex
+      #   puts "Ignoring exception: #{ex} - we will have to work it out the slow way"
+      #   []
+      end
+      list = @rubygems_cache[gem]
+      if list.size == 0
+        puts "Unable to find version info at rubygems for #{gem}"
+        return nil
+      end
+      current = list.select { |h| h['number'] == version }.first
+      if current.nil?
+        puts "Unable to find current version info at rubygems for #{gem}, version #{version}"
+        return nil
+      end
+      puts "Found record for current version: #{current.inspect}"
+      current_ruby_version = current['ruby_version']
+      # puts "current ruby_version: #{current_ruby_version.inspect}"
+      if current_ruby_version.nil?
+        puts "Rubygems has nil ruby_version spec for #{gem} #{version} - unable to pick next version"
+        return nil
+      end
+      found = false
+      same_versions = list.select do |h|
+        (h['ruby_version'] == current_ruby_version) && (h['number'] !~ /[a-z]/i)
+      end
+      next_version = same_versions.map { |h| h['number'] }.last
+      puts "Selected next_version: #{next_version}"
+      next_version
+      # [
+      #   {"authors":"Evan David Light",
+      #     "built_at":"2011-08-08T04:00:00.000Z",
+      #     "created_at":"2011-08-08T21:23:40.254Z",
+      #     "description":"Behaviour Driven Development derived from Cucumber but as an internal DSL with methods for reuse",
+      #     "downloads_count":3493,
+      #     "metadata":{},
+      #     "number":"0.7.1",
+      #     "summary":"Test::Unit-based acceptance testing DSL",
+      #     "platform":"ruby",
+      #     "rubygems_version":"\u003e= 0",
+      #     "ruby_version":null,
+      #     "prerelease":false,
+      #     "licenses":null,
+      #     "requirements":null,
+      #     "sha":"777c3a7ed83e44198b0a624976ec99822eb6f4a44bf1513eafbc7c13997cd86c"},
+    end
+
+
   end
 
 end

data/lib/smarter_bundler/gemfile.rb

@@ -21,18 +21,27 @@ module SmarterBundler
       end
       adjusted = false
       @contents.map! do |line|
-        if line =~ /^(\s*gem\s+['"]#{gem}['"])(\s*,\*['"]([^'"]*)['"])?(.*?)$/
+        if line =~ /^(\s*gem\s+['"]#{gem}['"])(.*)$/
           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
+          rest_of_line = $2
+          versions = [ ]
+          if rest_of_line =~ /^\s*,\s*['"]([^'"]*)['"](.*)/
+            versions = [ $1 ]
+            rest_of_line = $2
+          elsif rest_of_line =~ /^\s*,\s*\[([^\]]*)\](.*)/
+            rest_of_line = $2
+            versions = $1.split(',').map{|s| s.sub(/^[\s'"]*/, '').sub(/[\s'"]*$/, '')}
+          end
+          #puts "Found #{gem_and_name} in Gemfile with version spec: #{versions.inspect} and other args: #{rest_of_line}"
+          new_versions = versions.dup
+          new_versions.delete_if{|s| s =~ /</}
+          new_versions << "< #{version_limit}"
+          #puts "  Replacing with new version spec: #{new_versions.inspect}"
+          if new_versions != versions
             @changed = true
             rest_of_line.sub!(/  # REQUIRED - Added by SmarterBundler.*/, '')
             rest_of_line << '  # REQUIRED - Added by SmarterBundler'
-            line = "#{gem_and_name}, '#{new_version}'#{rest_of_line}"
+            line = "#{gem_and_name}, #{new_versions.inspect}#{rest_of_line}"
             puts "Changed Gemfile line to: #{line}"
             line
           else
@@ -53,6 +62,7 @@ module SmarterBundler
         end
         FileUtils.move "#{@filename}.new", @filename, :force => true
         @changed = false
+        puts 'Currently restricted:', *(@contents.select{|line| line =~ /Added by SmartBundler/})
       end
     end
 

data/lib/smarter_bundler/version.rb

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

metadata

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