pessimize 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 07827e52ca20091ec3c526e48c17b98cba42b107
+  data.tar.gz: b564e247b10d5047a2ac550ea8dfe30173915ede
+SHA512:
+  metadata.gz: 16636018050e5d063a624208ba84ff2e9a111e810e5a1cbc405a4aa0a18f5f09a75eb0b72d6fa9813ba3da08615938d15ec54081942d86e5af152a7ec5c35008
+  data.tar.gz: bbd02c68466c4dba8109f88c6cdf02ec1d7104d8a42317b84b279daf3d7709e7d51a3d7d6b580a5583fd52c40adacee0aa33fc5d34476f4e0eb89d1b0314fc1b

data/.travis.yml

@@ -4,4 +4,4 @@ rvm:
   - 2.0.0
   - 1.9.3
   - 1.9.2
-  - jruby-1.7.3
+  - jruby-1.7.10

data/{HISTORY → CHANGELOG}

@@ -1,3 +1,8 @@
+=== Pessimize 0.2.0
+
+Features:
+ * Use token parsing instead of interpreting the Gemfile, which allows the Gemfile formatting to be retained (issue #5)
+
 === Pessimize 0.1.0
 
 Features:

data/README.md

@@ -1,5 +1,6 @@
 # Pessimize
 
+[![Gem Version](https://badge.fury.io/rb/pessimize.png)](http://badge.fury.io/rb/pessimize)
 [![Build Status](https://travis-ci.org/joonty/pessimize.png?branch=master)](https://travis-ci.org/joonty/pessimize)
 
 ### Who is this for?
@@ -64,9 +65,9 @@ Also, by default, the Gemfile and Gemfile.lock are copied as a form of backup. T
 
 ## Known issues
 
-Pessimize evaluates the Gemfile as executable ruby code. That means that anything method-like will be retained in the output (e.g. `gem "nokogiri"`, or `source "https://rubygems.org"`), but anything else such as conditional statements will not.
+Pessimize parses the Gemfile as tokens, and does some tricky stuff to replace or insert version numbers. However, this is fairly experimental and there are plans to use a proper ruby parser, which should be more reliable and cut out the edge cases. It *should* currently work for the majority of cases, but there are no guarantees.
 
-There are plans to fix this: [see this issue][3] for tracking the progress.
+[See this issue][3] for tracking the progress.
 
 ## Why `bundle update` can be dangerous
 

data/lib/pessimize/file_manager.rb

@@ -32,7 +32,7 @@ module Pessimize
     def backup_file!(file)
       cmd = "cp #{file} #{file}.backup"
       puts " + #{cmd}"
-      system cmd
+      `#{cmd}`
       $?.exitstatus == 0
     end
   end

data/lib/pessimize/gem.rb

@@ -1,25 +1,63 @@
 module Pessimize
   class Gem
-    attr_reader :name, :version, :options
-    attr_writer :version
+    attr_reader :name, :original_tokens
+    attr_accessor :version
 
-    def initialize(*args)
-      @name = args.shift
-      while arg = args.shift
-        if arg.is_a? Hash
-          @options = arg
-        else
-          @version = arg
-        end
+    def initialize(gem_tokens)
+      self.original_tokens = gem_tokens
+      parse_name
+      parse_version
+    end
+
+    def tokens
+      compiled_tokens = original_tokens.dup
+      if version_index
+        compiled_tokens[version_index][2] = version
+      elsif version
+        compiled_tokens[after_name_index..0] = version_tokens
       end
+      compiled_tokens
     end
 
-    def to_code
-      s = ""
-      s << %Q{gem "#{name}"}
-      s << %Q{, "#{version}"} if version
-      s << %Q{, #{options.inspect}} if options
-      s
+    def to_s
+      tokens.inject("") { |a, t| a << t[2] }
+    end
+
+  protected
+    attr_writer :name, :original_tokens
+    attr_accessor :version_index,
+      :token_before_version,
+      :after_name_index
+
+    def version_tokens
+      [
+        [[], :on_comma, ","],
+        [[], :on_sp, " "],
+        [[], :on_tstring_beg, "\""],
+        [[], :on_tstring_content, version],
+        [[], :on_tstring_end, "\""]
+      ]
+    end
+
+    def parse_name
+      name_index = original_tokens.index { |t| t[1] == :on_tstring_content }
+      self.name = original_tokens[name_index][2]
+      self.after_name_index = name_index + 2
+    end
+
+    def parse_version
+      token_before_version = original_tokens.index { |t| t[1] == :on_comma }
+      if token_before_version
+        remaining_tokens = original_tokens[(token_before_version + 1)..-1]
+        while [:on_sp, :on_tstring_beg].include? remaining_tokens.first[1]
+          remaining_tokens.shift
+          token_before_version += 1
+        end
+        if remaining_tokens.first[1] == :on_tstring_content
+          self.version_index = token_before_version + 1
+          self.version = remaining_tokens.first[2]
+        end
+      end
     end
   end
 end

data/lib/pessimize/gemfile.rb

@@ -0,0 +1,52 @@
+require 'ripper'
+require 'pessimize/gem'
+
+module Pessimize
+  class Gemfile
+    attr_reader :tokens, :gems
+
+    def initialize(contents)
+      self.tokens = Ripper.lex(contents)
+      self.gems = []
+      self.gem_token_map = []
+      parse_tokens!
+    end
+
+    def to_s
+      compiled_tokens = tokens.dup
+      current_offset = 0
+      gem_token_map.zip(gems).each do |(tok_start, tok_end), gem|
+        gem_tokens = gem.tokens
+        compiled_tokens[(current_offset + tok_start)..(current_offset + tok_end)] = gem_tokens
+        current_offset += gem_tokens.length - (tok_end - tok_start + 1)
+      end
+      compiled_tokens.inject("") { |a, e|
+        a + e[2]
+      }
+    end
+
+  protected
+    attr_writer :gems, :tokens
+    attr_accessor :gem_token_map
+
+    def parse_tokens!
+      enum = tokens.each_with_index
+
+      loop do
+        (tok, i) = enum.next
+
+        if tok[1] == :on_ident && tok[2] == "gem"
+          gem_toks = []
+          until [:on_nl].include?(enum.peek[0][1])
+            (tok, j) = enum.next
+            gem_toks << tok
+          end
+
+          self.gems << Pessimize::Gem.new(gem_toks)
+          self.gem_token_map << [i + 1, j]
+        end
+      end
+    rescue StopIteration
+    end
+  end
+end

data/lib/pessimize/gemfile_lock_version_parser.rb

@@ -6,21 +6,21 @@ module Pessimize
 
     def initialize
       self.versions = {}
-      self.parse_enabled = false
     end
 
     def call(gemfile_lock_file)
-      parser = Bundler::LockfileParser.new gemfile_lock_file.read
-      self.versions = collect_names_and_versions parser.specs
+      parser = Bundler::LockfileParser.new(gemfile_lock_file.read)
+      self.versions = collect_names_and_versions(parser.specs)
       self
     end
 
   protected
     attr_writer   :versions
-    attr_accessor :parse_enabled
 
     def collect_names_and_versions(specs)
-      Hash[specs.collect { |s| [s.name, s.version.to_s] }]
+      Hash[specs.
+            reject { |s| s.source.is_a?(Bundler::Source::Git) }.
+            collect { |s| [s.name, s.version.to_s] }]
     end
   end
 end

data/lib/pessimize/pessimizer.rb

@@ -1,5 +1,4 @@
-require 'pessimize/dsl'
-require 'pessimize/gem_collection'
+require 'pessimize/gemfile'
 require 'pessimize/gemfile_lock_version_parser'
 require 'pessimize/version_mapper'
 
@@ -8,8 +7,6 @@ module Pessimize
     def initialize(file_manager, options)
       self.file_manager = file_manager
       self.options = options
-      self.collection = GemCollection.new
-      self.dsl = DSL.new collection
       self.lock_parser = GemfileLockVersionParser.new
     end
 
@@ -17,49 +14,30 @@ module Pessimize
       collect_gems_and_versions
       update_gem_versions
       write_new_gemfile
-      puts "~> written #{collection.all.length} gems to Gemfile, constrained to #{options[:version_constraint]} version updates\n\n"
+      puts "~> written #{gemfile.gems.length} gems to Gemfile, constrained to #{options[:version_constraint]} version updates\n\n"
     end
 
   protected
-    attr_accessor :collection, :dsl, :lock_parser, :file_manager, :options
+    attr_accessor :gemfile, :lock_parser, :file_manager, :options
 
     def sep(num = 1)
       "\n" * num
     end
 
     def collect_gems_and_versions
-      dsl.parse file_manager.gemfile_contents
+      self.gemfile = Gemfile.new(file_manager.gemfile_contents)
       lock_parser.call File.open(file_manager.gemfile_lock)
     end
 
     def update_gem_versions
-      VersionMapper.new.call(collection.all, lock_parser.versions, options[:version_constraint])
+      VersionMapper.new.call(gemfile.gems, lock_parser.versions, options[:version_constraint])
     end
 
     def write_new_gemfile
       File.delete(file_manager.gemfile)
       File.open(file_manager.gemfile, 'w') do |f|
-        collection.declarations.each do |dec|
-          f.write(dec.to_code + sep)
-        end
-        f.write sep(1)
-        gem_groups = collection.gems
-        global_gems = gem_groups[:global]
-        gem_groups.delete :global
-        gem_groups.each do |group, gems|
-          f.write("group :#{group} do#{sep}")
-          gems.each do |gem|
-            f.write("  " + gem.to_code + sep)
-          end
-          f.write("end" + sep(2))
-        end
-        if global_gems
-          global_gems.each do |gem|
-            f.write(gem.to_code + sep)
-          end
-        end
+        f.write gemfile.to_s
       end
     end
-
   end
 end

data/lib/pessimize/version.rb

@@ -1,3 +1,3 @@
 module Pessimize
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/gem_spec.rb

@@ -1,36 +1,74 @@
 require 'spec_helper'
-require 'pessimize/gem.rb'
+require 'pessimize/gem'
 
 module Pessimize
   describe Gem do
-    context "creating with the name as the only parameter" do
-      let(:gem) { Gem.new 'ponies' }
-      subject   { gem }
+    context "creating a gem with just a name" do
+      let(:gem) { Gem.new(Ripper.lex('gem "monkey"')) }
+      subject { gem }
 
-      its(:name) { should == 'ponies' }
-      its(:to_code) { should == 'gem "ponies"' }
+      its(:name) { should == "monkey" }
+      its(:version) { should be_nil }
+      its(:to_s) { should == 'gem "monkey"' }
 
-      context "setting the version" do
-        before { gem.version = '~> 3.0.0' }
+      context "after setting the version" do
+        before do
+          gem.version = "~> 2.3.5"
+        end
 
-        its(:version) { should == '~> 3.0.0' }
-      its(:to_code) { should == 'gem "ponies", "~> 3.0.0"' }
+        its(:to_s) { should == 'gem "monkey", "~> 2.3.5"' }
       end
     end
 
-    context "creating with a name and version string" do
-      subject { Gem.new 'trolls', '>= 3.0' }
+    context "creating a gem with a name and version" do
+      let(:gem) { Gem.new(Ripper.lex('gem "monkey", "~> 3.0"')) }
+      subject { gem }
 
-      its(:name) { should == 'trolls' }
-      its(:version) { should == '>= 3.0' }
-      its(:to_code) { should == 'gem "trolls", ">= 3.0"' }
+      its(:name) { should == "monkey" }
+      its(:version) { should == "~> 3.0" }
+      its(:to_s) { should == 'gem "monkey", "~> 3.0"' }
+
+      context "after setting the version" do
+        before do
+          gem.version = "~> 1.0"
+        end
+
+        its(:to_s) { should == 'gem "monkey", "~> 1.0"' }
+      end
     end
 
-    context "creating with a name and options hash" do
-      subject { Gem.new 'slow_loris', :require => false, :path => '/a/b/c' }
-      its(:name) { should == 'slow_loris' }
-      its(:options) { should == {:require => false, :path => '/a/b/c'} }
-      its(:to_code) { should == 'gem "slow_loris", {:require=>false, :path=>"/a/b/c"}' }
+    context "creating a gem with a name and git url" do
+      let(:gem) { Gem.new(Ripper.lex('gem "something", git: git@somewhere.org:project.git')) }
+      subject { gem }
+
+      its(:name) { should == "something" }
+      its(:version) { should be_nil }
+
+      context "after setting the version" do
+        before do
+          gem.version = "~> 0.0.1"
+        end
+
+        its(:to_s) { should == 'gem "something", "~> 0.0.1", git: git@somewhere.org:project.git' }
+      end
+
+    end
+
+    context "creating a gem with a name, version and options" do
+      let(:gem) { Gem.new(Ripper.lex('gem "blah", "2.0.0beta", group: :development')) }
+      subject { gem }
+
+      its(:name) { should == "blah" }
+      its(:version) { should == "2.0.0beta" }
+
+      context "after setting the version" do
+        before do
+          gem.version = "~> 2.1"
+        end
+
+        its(:to_s) { should == 'gem "blah", "~> 2.1", group: :development' }
+      end
+
     end
   end
 end

data/spec/gemfile_spec.rb

@@ -0,0 +1,122 @@
+require 'spec_helper'
+require 'pessimize/gemfile'
+
+module Pessimize
+  describe Gemfile do
+    context "with a single gem definition" do
+      let(:gem_defn) { <<-GEM
+source "https://rubygems.org"
+
+gem "monkey"
+GEM
+      }
+
+      subject(:gemfile) { Gemfile.new(gem_defn) }
+
+      its(:to_s) { should == gem_defn }
+
+      describe "#gems" do
+        subject(:gems) { gemfile.gems }
+
+        its(:length) { should == 1 }
+
+        describe "the first gem" do
+          subject { gems.first }
+
+          its(:name) { should == "monkey" }
+        end
+      end
+    end
+
+    context "with a gem definition and group" do
+      let(:gem_defn) { <<-GEM
+source "https://rubygems.org"
+
+group :development do
+  gem "monkey"
+end
+GEM
+      }
+
+      subject(:gemfile) { Gemfile.new(gem_defn) }
+
+      its(:to_s) { should == gem_defn }
+
+      describe "#gems" do
+        subject(:gems) { gemfile.gems }
+
+        its(:length) { should == 1 }
+
+        describe "the first gem" do
+          subject { gems.first }
+
+          its(:name) { should == "monkey" }
+        end
+      end
+    end
+
+    context "with multiple gem definitions" do
+
+      let(:gem_defn) { <<-GEM
+source "https://rubygems.org"
+
+gem "monkey", "2.0.0"
+
+gem "thor", ">= 1.3.0"
+GEM
+      }
+
+      subject(:gemfile) { Gemfile.new(gem_defn) }
+
+      its(:to_s) { should == gem_defn }
+
+      describe "#gems" do
+        subject(:gems) { gemfile.gems }
+
+        its(:length) { should == 2 }
+
+        describe "the first gem" do
+          subject(:gem) { gems[0] }
+
+          its(:name) { should == "monkey" }
+          its(:version) { should == "2.0.0" }
+          its(:to_s) { should == ' "monkey", "2.0.0"' }
+
+          context "setting the version" do
+            before do
+              gem.version = "~> 2.0.0"
+            end
+
+            its(:to_s) { should == ' "monkey", "~> 2.0.0"' }
+          end
+        end
+
+        describe "the second gem" do
+          subject { gems[1] }
+
+          its(:name) { should == "thor" }
+          its(:version) { should == ">= 1.3.0" }
+        end
+      end
+
+      context "after setting the gem versions" do
+        before do
+          gemfile.gems.each do |gem|
+            gem.version = "~> 1.0.0"
+          end
+        end
+
+        let(:expected_defn) { <<-GEM
+source "https://rubygems.org"
+
+gem "monkey", "~> 1.0.0"
+
+gem "thor", "~> 1.0.0"
+GEM
+        }
+
+        its(:to_s) { should == expected_defn }
+      end
+    end
+  end
+end

data/spec/integration_spec.rb

@@ -12,13 +12,13 @@ describe "running pessimize" do
 
     context "after execution" do
 
-      context "the stderr" do
+      context "the stderr", exclude_platform: :java do
         subject { stderr }
         it { should == "" }
       end
 
       # exclude from jruby
-      context "the return code", platform: :jruby do
+      context "the return code", exclude_platform: :java do
         subject { $?.exitstatus }
         it { should == 0 }
       end
@@ -56,7 +56,7 @@ describe "running pessimize" do
       end
 
       # exclude from jruby
-      context "the return code", platform: :jruby do
+      context "the return code", exclude_platform: :java do
         subject { $?.exitstatus }
         it { should == 0 }
       end
@@ -240,9 +240,8 @@ GEM
 
     result = <<-EOD
 source "https://rubygems.org"
-
-gem "json", "~> 1.8"
-gem "rake", "~> 10.0"
+gem 'json', "~> 1.8"
+gem 'rake', "~> 10.0"
     EOD
 
     it_behaves_like "a working pessimizer", gemfile, lockfile, result
@@ -275,17 +274,16 @@ GEM
 
     result = <<-EOD
 source "https://rubygems.org"
+gem 'json', "~> 1.8"
+gem 'rake', "~> 10.0"
 
 group :development do
-  gem "sqlite3", "~> 1.3"
+  gem 'sqlite3', '~> 1.3'
 end
 
 group :production do
-  gem "pg", "~> 0.15"
+  gem 'pg', '~> 0.15', '<= 0.15.2'
 end
-
-gem "json", "~> 1.8"
-gem "rake", "~> 10.0"
     EOD
 
     it_behaves_like "a working pessimizer", gemfile, lockfile, result
@@ -313,17 +311,12 @@ GEM
 
     result = <<-EOD
 source "https://rubygems.org"
+gem 'json', "~> 1.8"
+gem 'rake', "~> 10.0"
 
-group :development do
-  gem "sqlite3", "~> 1.3"
-end
-
-group :test do
-  gem "sqlite3", "~> 1.3"
+group :development, :test do
+  gem 'sqlite3', '~> 1.3'
 end
-
-gem "json", "~> 1.8"
-gem "rake", "~> 10.0"
     EOD
 
     it_behaves_like "a working pessimizer", gemfile, lockfile, result
@@ -351,17 +344,12 @@ GEM
 
     result = <<-EOD
 source "https://rubygems.org"
+gem 'json', "~> 1.8"
+gem 'rake', "~> 10.0"
 
-group :development do
-  gem "sqlite3", "~> 1.3"
-end
-
-group :test do
-  gem "sqlite3", "~> 1.3"
+group [:development, :test] do
+  gem 'sqlite3', '~> 1.3'
 end
-
-gem "json", "~> 1.8"
-gem "rake", "~> 10.0"
     EOD
 
     it_behaves_like "a working pessimizer", gemfile, lockfile, result
@@ -383,8 +371,7 @@ GEM
 
     result = <<-EOD
 source "https://rubygems.org"
-source "https://somewhereelse.com"
-
+source 'https://somewhereelse.com'
     EOD
 
     it_behaves_like "a working pessimizer", gemfile, lockfile, result
@@ -430,9 +417,9 @@ GEM
 
     result = <<-EOD
 source "https://somewhere-else.org"
+gem 'metric_fu', :git => 'https://github.com/joonty/metric_fu.git', :branch => 'master'
 
-gem "metric_fu", {:git=>"https://github.com/joonty/metric_fu.git", :branch=>"master"}
-gem "kaminari", "~> 0.14", {:require=>false}
+gem "kaminari", "~> 0.14", :require => false
     EOD
 
     it_behaves_like "a working pessimizer", gemfile, lockfile, result
@@ -478,9 +465,9 @@ GEM
 
     result = <<-EOD
 source "https://somewhere-else.org"
+gem 'metric_fu', :git => 'https://github.com/joonty/metric_fu.git', :branch => 'master'
 
-gem "metric_fu", {:git=>"https://github.com/joonty/metric_fu.git", :branch=>"master"}
-gem "kaminari", "~> 0.14", {:require=>false}
+gem "kaminari", "~> 0.14", :require => false
     EOD
 
     it_behaves_like "a working pessimizer", gemfile, lockfile, result
@@ -508,17 +495,12 @@ GEM
 
     result = <<-EOD
 source "https://rubygems.org"
+gem 'json', "~> 1.8.0"
+gem 'rake', "~> 10.0.4"
 
-group :development do
-  gem "sqlite3", "~> 1.3.7"
-end
-
-group :test do
-  gem "sqlite3", "~> 1.3.7"
+group :development, :test do
+  gem 'sqlite3', '~> 1.3.7'
 end
-
-gem "json", "~> 1.8.0"
-gem "rake", "~> 10.0.4"
     EOD
 
     it_behaves_like "a working pessimizer", gemfile, lockfile, result, '-c patch'
@@ -546,17 +528,12 @@ GEM
 
     result = <<-EOD
 source "https://rubygems.org"
+gem 'json', "~> 1.8"
+gem 'rake', "~> 10.0"
 
-group :development do
-  gem "sqlite3", "~> 1.3"
-end
-
-group :test do
-  gem "sqlite3", "~> 1.3"
+group :development, :test do
+  gem 'sqlite3', '~> 1.3'
 end
-
-gem "json", "~> 1.8"
-gem "rake", "~> 10.0"
     EOD
 
     it_behaves_like "a working pessimizer without backups", gemfile, lockfile, result, '--no-backup'

data/spec/spec_helper.rb

@@ -1,13 +1,14 @@
 require 'rspec'
 require 'pessimize'
 require 'open3'
+require 'ripper'
 
 def data_file(name)
   File.new(File.dirname(__FILE__) + '/data/' + name)
 end
 
 RSpec.configure do |c|
-  c.filter_run_excluding :platform => lambda { |platform|
+  c.filter_run_excluding :exclude_platform => lambda { |platform|
     RUBY_PLATFORM.to_s == platform.to_s
   }
 end

data/spec/version_mapper_spec.rb

@@ -4,8 +4,14 @@ require 'pessimize/gem'
 
 module Pessimize
   describe VersionMapper do
+    def gem(name, version = nil)
+      gem_string = %Q{gem "#{name}"}
+      gem_string << %Q{, "#{version}"} if version
+      Gem.new(Ripper.lex(gem_string))
+    end
+
     context "with a gem, version hash and minor constraint" do
-      let(:gems)     { [ Gem.new('example') ] }
+      let(:gems)     { [ gem('example') ] }
       let(:versions) { { 'example' => '2.2.3' } }
       let(:mapper)   { VersionMapper.new }
 
@@ -19,7 +25,7 @@ module Pessimize
     end
 
     context "with multiple gems, version hash and minor constraint" do
-      let(:gems)     { [ Gem.new('example'), Gem.new('fish', '1.3.2') ] }
+      let(:gems)     { [ gem('example'), gem('fish', '1.3.2') ] }
       let(:versions) { { 'example' => '1.4.9', 'fish' => '2.3.0' } }
       let(:mapper)   { VersionMapper.new }
 
@@ -41,7 +47,7 @@ module Pessimize
     end
 
     context "with a gem, version hash and patch constraint" do
-      let(:gems)     { [ Gem.new('example') ] }
+      let(:gems)     { [ gem('example') ] }
       let(:versions) { { 'example' => '2.2.3' } }
       let(:mapper)   { VersionMapper.new }
 
@@ -55,7 +61,7 @@ module Pessimize
     end
 
     context "with multiple gems, version hash and patch constraint" do
-      let(:gems)     { [ Gem.new('example'), Gem.new('fish', '1.3.2') ] }
+      let(:gems)     { [ gem('example'), gem('fish', '1.3.2') ] }
       let(:versions) { { 'example' => '1.4.9', 'fish' => '2.3.0' } }
       let(:mapper)   { VersionMapper.new }
 

metadata

@@ -1,89 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: pessimize
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Jon Cairns
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.3
-description: ! 'Add the pessimistic constraint operator to all gems in your Gemfile,
-  restricting the maximum update version.
-
+  prerelease: false
+  type: :development
+description: |-
+  Add the pessimistic constraint operator to all gems in your Gemfile, restricting the maximum update version.
 
-  This is for people who work with projects that use bundler, such as rails projects.
-  The pessimistic constraint operator (~>) allows you to specify the maximum version
-  that a gem can be updated, and reduces potential breakages when running `bundle
-  update`. Pessimize automatically retrieves the current versions of your gems, then
-  adds them to your Gemfile (so you don''t have to do it by hand).'
+  This is for people who work with projects that use bundler, such as rails projects. The pessimistic constraint operator (~>) allows you to specify the maximum version that a gem can be updated, and reduces potential breakages when running `bundle update`. Pessimize automatically retrieves the current versions of your gems, then adds them to your Gemfile (so you don't have to do it by hand).
 email:
 - jon@joncairns.com
 executables:
@@ -93,18 +79,16 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG
 - Gemfile
-- HISTORY
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/pessimize
 - lib/pessimize.rb
-- lib/pessimize/declaration.rb
-- lib/pessimize/dsl.rb
 - lib/pessimize/file_manager.rb
 - lib/pessimize/gem.rb
-- lib/pessimize/gem_collection.rb
+- lib/pessimize/gemfile.rb
 - lib/pessimize/gemfile_lock_version_parser.rb
 - lib/pessimize/pessimizer.rb
 - lib/pessimize/shell.rb
@@ -113,54 +97,42 @@ files:
 - pessimize.gemspec
 - spec/data/Gemfile.lock.example
 - spec/data/Gemfile.lock.example2
-- spec/declaration_spec.rb
-- spec/dsl_spec.rb
-- spec/gem_collection_spec.rb
 - spec/gem_spec.rb
 - spec/gemfile_lock_version_parser_spec.rb
+- spec/gemfile_spec.rb
 - spec/integration_spec.rb
 - spec/spec_helper.rb
 - spec/version_mapper_spec.rb
 homepage: https://github.com/joonty/pessimize
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 102420707118458476
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 102420707118458476
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
-signing_key: 
-specification_version: 3
-summary: Add the pessimistic constraint operator to all gems in your Gemfile, restricting
-  the maximum update version.
+rubyforge_project:
+rubygems_version: 2.4.6
+signing_key:
+specification_version: 4
+summary: Add the pessimistic constraint operator to all gems in your Gemfile, restricting the maximum update version.
 test_files:
 - spec/data/Gemfile.lock.example
 - spec/data/Gemfile.lock.example2
-- spec/declaration_spec.rb
-- spec/dsl_spec.rb
-- spec/gem_collection_spec.rb
 - spec/gem_spec.rb
 - spec/gemfile_lock_version_parser_spec.rb
+- spec/gemfile_spec.rb
 - spec/integration_spec.rb
 - spec/spec_helper.rb
 - spec/version_mapper_spec.rb

data/lib/pessimize/declaration.rb

@@ -1,17 +0,0 @@
-module Pessimize
-  class Declaration
-    attr_reader :name, :args
-
-    def initialize(name, *args)
-      @name = name
-      @args = args
-    end
-
-    def to_code
-      s = ""
-      s << "#{name} "
-      s << args.map(&:inspect).join(", ")
-      s
-    end
-  end
-end

data/lib/pessimize/dsl.rb

@@ -1,39 +0,0 @@
-module Pessimize
-  class DSL
-    def initialize(collector)
-      @collector = collector
-      @current_groups = nil
-    end
-
-    def parse(definition)
-      instance_eval definition, __FILE__, __LINE__
-    end
-
-    def method_missing(name, *args)
-      collector.add_declaration(name.to_s, *args)
-    end
-
-  protected
-    attr_reader :collector
-    attr_accessor :current_groups
-
-    def gem(*args)
-      if current_groups
-        current_groups.each do |group|
-          collector.add_grouped_gem(group, *args)
-        end
-      else
-        collector.add_gem(*args)
-      end
-    end
-
-    def group(group, *others)
-      groups = [group].flatten + others
-      if block_given?
-        self.current_groups = groups
-        yield
-        self.current_groups = nil
-      end
-    end
-  end
-end

data/lib/pessimize/gem_collection.rb

@@ -1,34 +0,0 @@
-require_relative 'gem'
-require_relative 'declaration'
-
-module Pessimize
-  class GemCollection
-    attr_reader :gems, :declarations
-
-    def initialize
-      @gems = Hash.new do |hash, missing|
-        hash[missing] = []
-      end
-      @declarations = []
-    end
-
-    def add_gem(*args)
-      add_grouped_gem(:global, *args)
-    end
-
-    def add_grouped_gem(group, *args)
-      self.gems[group] << Gem.new(*args)
-    end
-
-    def add_declaration(name, *args)
-      self.declarations << Declaration.new(name, *args)
-    end
-
-    def all
-      gems.values.flatten
-    end
-
-  protected
-    attr_writer :gems, :declarations
-  end
-end

data/spec/declaration_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-require 'pessimize/declaration'
-
-module Pessimize
-  describe Declaration do
-    context "creating a 'source' declaration" do
-      subject { Declaration.new 'source', 'https://rubygems.org' }
-      its(:to_code) { should == 'source "https://rubygems.org"' }
-    end
-
-    context "creating a 'source' declaration with a symbol value" do
-      subject { Declaration.new 'source', :rubygems }
-      its(:to_code) { should == 'source :rubygems' }
-    end
-
-    context "creating a 'git' declaration" do
-      subject { Declaration.new 'git', 'git://github.com/wycats/thor.git', :tag => "v0.13.4" }
-      its(:to_code) { should == 'git "git://github.com/wycats/thor.git", {:tag=>"v0.13.4"}' }
-    end
-  end
-end

data/spec/dsl_spec.rb

@@ -1,140 +0,0 @@
-require 'spec_helper'
-require 'pessimize/dsl'
-
-module Pessimize
-  describe DSL do
-    let(:collector)  { double "collector" }
-    let(:dsl)        { DSL.new collector  }
-
-    shared_examples "a collector receiving a gem" do |definition, *args|
-      context "the collector" do
-        it "should receive the gem message with correct arguments" do
-          collector.should_receive(:add_gem).with(*args)
-          dsl.parse definition
-        end
-      end
-    end
-
-    context "with a string containing a gem definition" do
-      it_behaves_like "a collector receiving a gem", "gem 'monkey'", 'monkey'
-    end
-
-    context "with a string containing a gem definition with multiple arguments" do
-      it_behaves_like "a collector receiving a gem", 
-                      "gem 'hippo', '~> 2.0.0', :require => false",
-                      'hippo', '~> 2.0.0', :require => false
-    end
-
-    context "with a string containing multiple gem definitions" do
-      let(:definition) { <<-EOD
-gem 'ponies', '>= 3.0.0'
-gem 'shark', :require => false
-        EOD
-      }
-      context "the collector" do
-        it "should receive the gem message with correct arguments" do
-          collector.should_receive(:add_gem).with('ponies', '>= 3.0.0')
-          collector.should_receive(:add_gem).with('shark', :require => false)
-          dsl.parse definition
-        end
-      end
-    end
-
-    context "with a string containing a group definition" do
-      let(:definition) { <<-EOD
-group :test do
-  gem 'ponies', '>= 3.0.0'
-end
-        EOD
-      }
-      context "the collector" do
-        it "should receive the grouped gem message with correct arguments" do
-          collector.should_receive(:add_grouped_gem).with(:test, 'ponies', '>= 3.0.0')
-          dsl.parse definition
-        end
-      end
-    end
-
-    context "with a string containing a group definition and multiple gems" do
-      let(:definition) { <<-EOD
-group :development do
-  gem 'ponies', '>= 3.0.0'
-  gem 'badgers', '~> 1.3.2', :require => false
-end
-
-gem 'ostriches', '0.0.1'
-        EOD
-      }
-      context "the collector" do
-        it "should receive the grouped gem message with correct arguments" do
-          collector.should_receive(:add_grouped_gem).with(:development, 'ponies', '>= 3.0.0')
-          collector.should_receive(:add_grouped_gem).with(:development, 'badgers', '~> 1.3.2', :require => false)
-          collector.should_receive(:add_gem).with('ostriches', '0.0.1')
-          dsl.parse definition
-        end
-      end
-    end
-
-    context "with a string containing a group definition with multiple arguments" do
-      let(:definition) { <<-EOD
-group :development, :test do
-  gem 'ponies', '>= 3.0.0'
-end
-        EOD
-      }
-      context "the collector" do
-        it "should receive the grouped gem message with correct arguments" do
-          collector.should_receive(:add_grouped_gem).with(:development, 'ponies', '>= 3.0.0')
-          collector.should_receive(:add_grouped_gem).with(:test, 'ponies', '>= 3.0.0')
-          dsl.parse definition
-        end
-      end
-    end
-
-    context "with a string containing a group definition with an array of groups" do
-      let(:definition) { <<-EOD
-group [:development, :test] do
-  gem 'ponies', '>= 3.0.0'
-end
-        EOD
-      }
-      context "the collector" do
-        it "should receive the grouped gem message with correct arguments" do
-          collector.should_receive(:add_grouped_gem).with(:development, 'ponies', '>= 3.0.0')
-          collector.should_receive(:add_grouped_gem).with(:test, 'ponies', '>= 3.0.0')
-          dsl.parse definition
-        end
-      end
-    end
-
-    context "with a string containing a source declaration and a gem" do
-      let(:definition) { <<-EOD
-source "https://rubygems.org"
-gem 'ostriches', '0.0.1'
-        EOD
-      }
-      context "the collector" do
-        it "should receive the grouped gem message with correct arguments" do
-          collector.should_receive(:add_declaration).with('source', 'https://rubygems.org')
-          collector.should_receive(:add_gem).with('ostriches', '0.0.1')
-          dsl.parse definition
-        end
-      end
-    end
-
-    context "with a string containing a git declaration and something unknown" do
-      let(:definition) { <<-EOD
-git 'git://github.com/wycats/thor.git', :tag => 'v0.13.4'
-unknown 'sausages'
-        EOD
-      }
-      context "the collector" do
-        it "should receive the grouped gem message with correct arguments" do
-          collector.should_receive(:add_declaration).with('git', 'git://github.com/wycats/thor.git', :tag => 'v0.13.4')
-          collector.should_receive(:add_declaration).with('unknown', 'sausages')
-          dsl.parse definition
-        end
-      end
-    end
-  end
-end

data/spec/gem_collection_spec.rb

@@ -1,91 +0,0 @@
-require 'spec_helper'
-require 'pessimize/gem_collection'
-
-module Pessimize
-  describe GemCollection do
-    let(:collection) { GemCollection.new }
-
-    describe "#add_gem" do
-      context "adding a gem with a version" do
-        before { collection.add_gem('ponies', '>= 0.3.0') }
-        let(:gem) { collection.all.first }
-        subject { gem }
-
-        it { should be_a Gem }
-        its(:name)    { should == 'ponies' }
-        its(:version) { should == '>= 0.3.0' }
-
-        it "should be the same as the first gem in the global group" do
-          subject.should === collection.gems[:global].first
-        end
-
-        context "after setting the version" do
-          before { gem.version = '~> 0.3.1' }
-
-          its(:version) { should == '~> 0.3.1' }
-        end
-      end
-
-      context "adding a gem with options" do
-        before { collection.add_gem('ponies', :git => 'git@github.com:rails/rails.git') }
-        subject { collection.all.first }
-
-        it { should be_a Gem }
-        its(:name)    { should == 'ponies' }
-        its(:options) { should == {:git=>'git@github.com:rails/rails.git'} }
-
-        it "should be the same as the first gem in the global group" do
-          subject.should === collection.gems[:global].first
-        end
-      end
-    end
-
-    describe "#add_grouped_gem" do
-      context "adding a gem in the development group" do
-        before { collection.add_grouped_gem(:development, 'ponies', '~> 0.2.3') }
-        subject { collection.all.first }
-
-        it { should be_a Gem }
-        its(:name)    { should == 'ponies' }
-        its(:version) { should == '~> 0.2.3' }
-
-        it "should be the same as the first gem in the development group" do
-          subject.should === collection.gems[:development].first
-        end
-      end
-
-      context "adding a gem in the production group" do
-        before { collection.add_grouped_gem(:production, 'badger', '~> 1.4.1') }
-        subject { collection.all.first }
-
-        it { should be_a Gem }
-        its(:name)    { should == 'badger' }
-        its(:version) { should == '~> 1.4.1' }
-
-        it "should be the same as the first gem in the production group" do
-          subject.should === collection.gems[:production].first
-        end
-      end
-    end
-
-    describe "#add_declaration" do
-      context "adding a source declaration" do
-        before { collection.add_declaration('source', 'https://rubygems.org') }
-        subject { collection.declarations.first }
-
-        it { should be_a Declaration }
-        its(:name) { should == 'source' }
-        its(:to_code) { should == 'source "https://rubygems.org"' }
-      end
-
-      context "adding a git declaration" do
-        before { collection.add_declaration('git', 'git://github.com/wycats/thor.git', :tag => 'v0.13.4') }
-        subject { collection.declarations.first }
-
-        it { should be_a Declaration }
-        its(:name) { should == 'git' }
-        its(:to_code) { should == 'git "git://github.com/wycats/thor.git", {:tag=>"v0.13.4"}' }
-      end
-    end
-  end
-end