smarter_bundler 0.1.2 → 0.1.3

data/.ruby-versions

@@ -0,0 +1,6 @@
+1.8.7-p375
+1.9.3-p551
+1.9.2-p330
+2.2.0
+2.2.2
+2.3.0

data/CHANGELOG

@@ -0,0 +1,2 @@
+* 1.0.0
+  * First producton version (used by health_check tests and my clients projects)

data/README.md

@@ -1,6 +1,6 @@
 # SmarterBundler
 
-Enhances bundler by adjusting Gemfile when correctable errors are found
+Enhances bundler by adjusting Gemfile when correctable errors are found.
 
 It is primarily aimed at resolving ruby version conflicts where a gem now requires a later ruby version.
 
@@ -16,15 +16,20 @@ Do not install it via Gemfile, as it needs to execute even if bundle can't insta
 
 Use smarter_bundle instead of the bundle command when installing or upgrading gems.
 
+If you are using it in an automated deploy, then monitor the time the deploy takes, as 
+the more fixes this program does, the longer it takes (since it reruns bundler to check the fixed Gemfile).
+A reasonable limit would be four to ten times the time it normally takes to install.
+Once you hit that limit, then check your install log and incorporate the fixes it has found into your Gemfile
+source to remove the need for it to run bundler multiple times whilst it fixes the Gemfile.
+
 ## Notes
 
-The algorithm is simplistic - when an error of the form 
-`Gem::RuntimeRequirementNotMetError: <gem_name> requires Ruby version`
-is found, as well as
-`An error occurred while installing <gem_name> (<gem_version>), and Bundler cannot continue`
-Then it adjusts the Gemfile to require a version of that gem lower than the one that produced the error.
+If the error indicates a ruby version conflict, then it will lookup the gem on rubygems to find the earliest version with the same ruby spec
+and update the Gemfile to specify a version prior to that. If the lookup of rubygems fails, then it will simply check the next earlier version.
+
+If the error was not from a ruby version conflict, it will attempt to install the gem directly once more.
 
-It will attempt upto 100 times to adjust the Gemfile before giving up.
+It will attempt to fix the Gemfile up to 100 times before giving up as long as each attempt is making progress.
 
 Once the Gemfile has been adjusted, commit it into your source repository so that it does not need to be used again.
 
@@ -34,6 +39,43 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+
+### Testing in a VM
+
+Use a vagrant virtual box for consistant results.
+
+Install vagrant 1.9.7 or later and virtual_box or other local virtual machine providor.
+
+Create a temp directory for throw away testing, and clone the gem into it
+
+    mkdir -p ~/tmp
+    cd ~/tmp
+    git clone https://github.com/ianheggie/smarter_bundler.git ~/tmp/smarter_bundler
+
+The Vagrantfile includes provisioning rules to install chruby (ruby version control),
+ruby-build will also be installed and run to build various rubies under /opt/rubies.
+
+Use <tt>vagrant ssh</tt> to connect to the virtual box and run tests.
+
+Cd to the checked out smarter_bundler directory and then run the test as follows:
+
+    cd ~/tmp/smarter_bundler
+
+    vagrant up   # this will also run vagrant provision and take some time
+                 # chruby and various ruby versions will be installed
+
+    vagrant ssh
+
+    cd /vagrant  # the current directory on your host is mounted here on the virtual machine
+
+    chruby 2.2.2 # or some other ruby version (run chruby with no arguments to see the current list)
+
+    bin/test
+
+    exit        # from virtual machine when finished
+
+The test script will run the smarter_bundle command on various rails Gemfiles (selected based on the current ruby version).
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/ianheggie/smarter_bundler.

data/Vagrantfile

@@ -0,0 +1,89 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+
+  # Latest Ubunutu LTS
+  config.vm.box = "ubuntu/xenial64"
+
+  # provision with a shell script.
+  config.vm.provision "shell",
+    path: "https://raw.githubusercontent.com/ianheggie/provision_vagrant/master/provision?cache_bust=#{Process.pid}",
+    args: %w{ /vagrant }
+
+  # Stop nagging as this box changes daily...
+  config.vm.box_check_update = true
+
+  # Do NOT download the iso file from a webserver (we don't use it)
+  config.vbguest.no_remote = true
+
+  # -------------------------------------------------------------
+  # DEFAULT HELP COMMENTS FROM VAGRANT
+
+  # All Vagrant configuration is done below (from Vagrant.configure onwards).
+  # The "2" in Vagrant.configure
+  # configures the configuration version (we support older styles for
+  # backwards compatibility). Please don't change it unless you know what
+  # you're doing.
+  
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+  
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://vagrantcloud.com/search.
+  
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # NOTE: This will enable public access to the opened port
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine and only allow access
+  # via 127.0.0.1 to disable public access
+  # config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline: <<-SHELL
+  #   apt-get update
+  #   apt-get install -y apache2
+  # SHELL
+end

data/bin/test

@@ -48,6 +48,9 @@ if [ $# -gt 0 ]; then
   dirs="$*"
 fi
 unset BUNDLE_GEMFILE
+
+which bundle || ( gem install bundler ; bundle )
+
 for d in $dirs
 do
   if [ -s "test/$d/Gemfile.default" ] ; then

data/lib/smarter_bundler/bundle.rb

@@ -8,7 +8,7 @@ module SmarterBundler
   class Bundle
     include SmarterBundler::Shell
 
-    KNOWN_ISSUES_192 = {
+    KNOWN_ISSUES_187_192 = {
         'unicorn' => '5.0',
         'nokogiri' => '1.6.0',
         'jbuilder' => '2.0.0',
@@ -16,9 +16,20 @@ module SmarterBundler
         'factory_bot' => '3.0',
     }
 
+    KNOWN_ISSUES_193_221 = {
+    }
+
+    KNOWN_ISSUES_222_22x = {
+        'listen' => '3.1.2',
+        'acts-as-taggable-on' => '5.0.0',
+        'guard-rails' => '0.7.3',
+        'jasmine' => '3.0.0',
+        'ruby_dep' => '1.4.0',
+    }
+
 
     def run(bundle_args)
-      puts "Smarter Bundler will recursively install your gems and output the successful bundler output. This may take a while."
+      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 = []
@@ -28,13 +39,13 @@ module SmarterBundler
         failed_gem_and_version = parse_output(result)
         if failed_gem_and_version
           if previous_failure == failed_gem_and_version
-            puts "Aborting: Stuck trying to install the same gem and version!"
+            puts 'Aborting: Stuck trying to install the same gem and version!'
             exit 1
           end
           previous_failure = failed_gem_and_version
           gem, version = *failed_gem_and_version
           if !ruby_version_clash(result) && install_failed_gem(gem, version)
-            puts "Retrying seems to have fixed the problem"
+            puts 'Retrying seems to have fixed the problem'
           elsif gemfile.restrict_gem_version(gem, known_issues(gem))
             gemfile.save
             count += 1
@@ -45,7 +56,7 @@ module SmarterBundler
             gemfile.save
             count += 1
           else
-            puts "Aborting: Unable to fix installation of gems"
+            puts 'Aborting: Unable to fix installation of gems'
             exit 2
           end
         else
@@ -69,8 +80,12 @@ module SmarterBundler
     end
 
     def known_issues(gem)
-      if RUBY_VERSION < '1.9.3'
-        KNOWN_ISSUES_192[gem]
+      if RUBY_VERSION <= '1.9.2'
+        KNOWN_ISSUES_187_192[gem]
+      elsif RUBY_VERSION <= '2.2.1'
+        KNOWN_ISSUES_193_221[gem]
+      elsif RUBY_VERSION <= '2.3'
+        KNOWN_ISSUES_222_22x[gem]
       else
         nil
       end
@@ -113,9 +128,9 @@ module SmarterBundler
         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"
-      #   []
+      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

data/lib/smarter_bundler/gemfile.rb

@@ -6,7 +6,7 @@ module SmarterBundler
 
     def initialize
       @filename = ENV['BUNDLE_GEMFILE'] || 'Gemfile'
-      @contents = [ ]
+      @contents = []
       File.open(@filename, 'r').each do |line|
         line.chomp
         @contents << line
@@ -16,7 +16,7 @@ module SmarterBundler
 
     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?
+      if @contents.select { |line| line =~ /^\s*gem\s+['"]#{gem}['"]/ }.empty?
         @contents << "gem '#{gem}', '>=0'"
       end
       adjusted = false
@@ -24,17 +24,17 @@ module SmarterBundler
         if line =~ /^(\s*gem\s+['"]#{gem}['"])(.*)$/
           gem_and_name = $1
           rest_of_line = $2
-          versions = [ ]
+          versions = []
           if rest_of_line =~ /^\s*,\s*['"]([^'"]*)['"](.*)/
-            versions = [ $1 ]
+            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'"]*$/, '')}
+            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.delete_if { |s| s =~ /</ }
           new_versions << "< #{version_limit}"
           #puts "  Replacing with new version spec: #{new_versions.inspect}"
           if new_versions != versions
@@ -62,7 +62,7 @@ module SmarterBundler
         end
         FileUtils.move "#{@filename}.new", @filename, :force => true
         @changed = false
-        puts 'Currently restricted:', *(@contents.select{|line| line =~ /Added by SmartBundler/})
+        puts 'Currently restricted:', *(@contents.select { |line| line =~ /Added by SmarterBundler/ })
       end
     end
 

data/lib/smarter_bundler/shell.rb

@@ -1,8 +1,8 @@
 module SmarterBundler
   module Shell
     def shell(command)
-      puts '',"+ #{command}"
-      output = [ ]
+      puts '', "+ #{command}"
+      output = []
       IO.popen("#{command} 2>&1") do |io|
         while line = io.gets
           puts line.chomp
@@ -13,7 +13,7 @@ module SmarterBundler
       puts "Command returned status: #{$?.to_i} (#{$?.success? ? 'success' : 'fail'})"
       Struct.new(:status, :output).new($?, output)
     end
-  
+
     def shell?(command)
       result = shell(command)
       result.status.success?

data/lib/smarter_bundler/version.rb

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

metadata

@@ -1,79 +1,87 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: smarter_bundler
-version: !ruby/object:Gem::Version
-  version: 0.1.2
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
-authors:
+authors: 
 - Ian Heggie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2018-03-14 00:00:00 +11:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 1
+        - 16
+        version: "1.16"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  requirement: *id001
+  name: bundler
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 10
+        - 0
+        version: "10.0"
+  prerelease: false
+  type: :development
+  requirement: *id002
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 5
+        - 0
+        version: "5.0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.0'
-description: The smarter_bundle retries installing gems, and if that fails it tries
-  installing an earlier version by adjusting the Gemfile
-email:
+  requirement: *id003
+  name: minitest
+description: The smarter_bundle retries installing gems, and if that fails it tries installing an earlier version by adjusting the Gemfile
+email: 
 - ian@heggie.biz
-executables:
+executables: 
 - smarter_bundle
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- .ruby-versions
 - .travis.yml
+- CHANGELOG
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- Vagrantfile
 - bin/console
 - bin/setup
 - bin/test
@@ -84,35 +92,39 @@ files:
 - lib/smarter_bundler/shell.rb
 - lib/smarter_bundler/version.rb
 - smarter_bundler.gemspec
+has_rdoc: true
 homepage: https://github.com/ianheggie/smarter_bundler
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2247782191630905192
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2247782191630905192
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Enhances bundler by adjusting Gemfile when correctable errors are found
 test_files: []
+