pessimize 0.0.2 → 0.0.3

data/HISTORY

@@ -0,0 +1,13 @@
+=== Pessimize 0.0.3
+
+Bug fixes:
+ * Fix bug with multiple arguments to `group` not being recognised (issue #1)
+ * Fix missing newlines between statements in Gemfile (issue #2)
+
+Features:
+ * Better error messages when evaluating a Gemfile with errors (thanks @deepak, #3)
+
+=== Pessimize 0.0.2
+
+Features:
+ * Was born (we don't talk about v0.0.1)

data/README.md

@@ -9,7 +9,7 @@ Anyone who works with a Gemfile, i.e. a project that uses [bundler][1].
 Pessimize adds version numbers with the pessimistic constraint operator (`~>`, a.k.a. "spermy" operator) to all gems in your `Gemfile`.
 
 ### Why?
-You should be using `~> x.x.x` to limit the version numbers of your gems, otherwise `bundle update` could potentially break your application. Read the section on "why bundle update can be dangerous" for a more detailed description, or take a look at the [rubygems explanation][1].
+You should be using `~> x.x.x` to limit the version numbers of your gems, otherwise `bundle update` could potentially break your application. Read the section on "why bundle update can be dangerous" for a more detailed description, or take a look at the [rubygems explanation][2].
 
 ### But why a gem?
 
@@ -37,6 +37,12 @@ This backs up the existing `Gemfile` and creates a new one with everything neatl
 
 And that's it!
 
+## 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.
+
+There are plans to fix this: [see this issue][3] for tracking the progress.
+
 ## Why `bundle update` can be dangerous
 
 If you add gems to your Gemfile without specifying a version, bundler will attempt to get the latest stable version for that gem. When you first run `bundle install`, bundler will get and install the latest versions, then create a `Gemfile.lock` which specifies the versions used.
@@ -55,3 +61,4 @@ The pessimistic constraint operator will only allow the final number of the vers
 
 [1]: http://gembundler.com
 [2]: http://docs.rubygems.org/read/chapter/16#page74
+[3]: https://github.com/joonty/pessimize/issues/5

data/lib/pessimize/dsl.rb

@@ -2,11 +2,11 @@ module Pessimize
   class DSL
     def initialize(collector)
       @collector = collector
-      @current_group = nil
+      @current_groups = nil
     end
 
     def parse(definition)
-      instance_eval definition
+      instance_eval definition, __FILE__, __LINE__
     end
 
     def method_missing(name, *args)
@@ -15,21 +15,24 @@ module Pessimize
 
   protected
     attr_reader :collector
-    attr_accessor :current_group
+    attr_accessor :current_groups
 
     def gem(*args)
-      if current_group
-        collector.add_grouped_gem(current_group, *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(name)
+    def group(group, *others)
+      groups = [group].flatten + others
       if block_given?
-        self.current_group = name
+        self.current_groups = groups
         yield
-        self.current_group = nil
+        self.current_groups = nil
       end
     end
   end

data/lib/pessimize/pessimizer.rb

@@ -43,9 +43,9 @@ module Pessimize
       File.delete(file_manager.gemfile)
       File.open(file_manager.gemfile, 'w') do |f|
         collection.declarations.each do |dec|
-          f.write(dec.to_code)
+          f.write(dec.to_code + sep)
         end
-        f.write sep(2)
+        f.write sep(1)
         gem_groups = collection.gems
         global_gems = gem_groups[:global]
         gem_groups.delete :global

data/lib/pessimize/version.rb

@@ -1,3 +1,3 @@
 module Pessimize
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/dsl_spec.rb

@@ -75,6 +75,38 @@ gem 'ostriches', '0.0.1'
       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"

data/spec/integration_spec.rb

@@ -197,6 +197,105 @@ gem "rake", "~> 10.0.4"
     it_behaves_like "a working pessimizer", gemfile, lockfile, result
   end
 
+  context "with a Gemfile containing a group with multiple arguments" do
+    gemfile = <<-EOD
+source "https://rubygems.org"
+gem 'json'
+gem 'rake'
+
+group :development, :test do
+  gem 'sqlite3', '>= 1.3.7'
+end
+    EOD
+
+    lockfile = <<-EOD
+GEM
+  remote: https://rubygems.org/
+  specs:
+    json (1.8.0)
+    rake (10.0.4)
+    sqlite3 (>= 1.3.7)
+    EOD
+
+    result = <<-EOD
+source "https://rubygems.org"
+
+group :development do
+  gem "sqlite3", "~> 1.3.7"
+end
+
+group :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
+  end
+
+  context "with a Gemfile containing a group with an array argument" do
+    gemfile = <<-EOD
+source "https://rubygems.org"
+gem 'json'
+gem 'rake'
+
+group [:development, :test] do
+  gem 'sqlite3', '>= 1.3.7'
+end
+    EOD
+
+    lockfile = <<-EOD
+GEM
+  remote: https://rubygems.org/
+  specs:
+    json (1.8.0)
+    rake (10.0.4)
+    sqlite3 (>= 1.3.7)
+    EOD
+
+    result = <<-EOD
+source "https://rubygems.org"
+
+group :development do
+  gem "sqlite3", "~> 1.3.7"
+end
+
+group :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
+  end
+
+
+  context "with a Gemfile containing multiple source statements" do
+    gemfile = <<-EOD
+source "https://rubygems.org"
+source 'https://somewhereelse.com'
+    EOD
+
+    lockfile = <<-EOD
+GEM
+  remote: https://rubygems.org/
+  specs:
+    json (1.8.0)
+    EOD
+
+    result = <<-EOD
+source "https://rubygems.org"
+source "https://somewhereelse.com"
+
+    EOD
+
+    it_behaves_like "a working pessimizer", gemfile, lockfile, result
+  end
+
   context "with a Gemfile containing gems with options" do
     gemfile = <<-EOD
 source "https://somewhere-else.org"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pessimize
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -62,6 +62,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- HISTORY
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -102,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3427935743038499316
+      hash: -3777369686549972789
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3427935743038499316
+      hash: -3777369686549972789
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25