gemrat 0.4.1 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 216961a16064cfeb7bfa46e9ce9b54405a441c95
-  data.tar.gz: 1f2c880ce9f37dc74fe800bea04d42ee9e72a447
+  metadata.gz: 8e2af8b711a88c22469a2f7fe4107132b71bb807
+  data.tar.gz: 71a4550605b41a74807f30929a3f98d1a126b5b5
 SHA512:
-  metadata.gz: ec21cc4ad4f28d5d8ba95122552e9c8fb2d4a9381f7cc8dd93d20ae2ed72d2a70d923b4ffd31262f1fbbc8eb1a44f957252f79afa95864123fd7aad72c6d2b4c
-  data.tar.gz: bd683873802d13ca0511b14900ea3495d6865be95e9998762acafc70816c535cccf7f17d54d09be11e84c5f68747461d1388f98da81a633e7679ef76ef6767d6
+  metadata.gz: 8ebf6870e8a129a7fb6a1906cf793e778bfbe8f6ab589f6b18ff3881e63848d5b88df63950845e17b06fcf105b2e85ac49c0c15976c4afd2eaaa3f862586721d
+  data.tar.gz: bc07ef9354a291fea02078a386366b3db7a918bf6342d4466b95efb951634d3c01e6f0e7be6225f74b3be3a67e2ad3ab293e87c97c679caa53c24987c081b6df

data/README.md

@@ -32,7 +32,7 @@ $ gemrat rspec capybara sidekiq
 
 Get help
 <pre>
-$ gemrat --help OR gemrat -h
+$ gemrat
 
 Gemrat
 
@@ -42,8 +42,11 @@ Usage: gemrat [GEM_NAME] [OPTIONS]
 
 Options:
 
-  -g [--gemfile]  # Specify the Gemfile to be used. Defaults to 'Gemfile'.
-  -h [--help]     # Print these usage instructions.
+    -g, --gemfile GEMFILE            # Specify the Gemfile to be used, defaults to 'Gemfile'
+        --no-install                 # Skip executing bundle after adding the gem.
+        --no-version                 # Do not add a version to the gemfile.
+    -v, --version                    # Show current gemrat version.
+    -h, --help                       # Print these usage instructions.
 </pre>
 <br/>
 

data/lib/gemrat/arguments.rb

@@ -53,6 +53,14 @@ module Gemrat
             options.no_version = true
           end
 
+          opts.on("-p", "--pessimistic", "# Add gem with a pessimistic operator (~>)") do
+            options.version_constraint = "pessimistic"
+          end
+
+          opts.on("-o", "--optimistic", "# Add gem with an optimistic operator (>=)") do
+            options.version_constraint = "optimistic"
+          end
+
           opts.on_tail("-h", "--help", "# Print these usage instructions.") do
             puts opts
             raise PrintHelp

data/lib/gemrat/gem.rb

@@ -1,12 +1,13 @@
 module Gemrat
   class Gem
     class NotFound < StandardError; end
+    class InvalidFlags < StandardError; end
 
-    attr_accessor :name, :valid, :action
+    attr_accessor :name, :valid, :action, :version_constraint, :no_version
     alias_method :valid?, :valid
 
     ACTIONS = OpenStruct.new({:add => "add", :update => "update",
-                              :skip => "skip", :no_version => "no version"})
+                              :skip => "skip"})
 
     def initialize
       self.valid = true
@@ -15,7 +16,7 @@ module Gemrat
     end
 
     def to_s
-      @output ||= "gem '#{name}', '#{version}'"
+      @output ||= get_output
     end
 
     def invalid!
@@ -45,7 +46,7 @@ module Gemrat
     def skip?
       self.action == ACTIONS.skip
     end
-    
+
     def add!
       self.action = ACTIONS.add
     end
@@ -54,16 +55,42 @@ module Gemrat
       self.action == ACTIONS.add
     end
 
-    def no_version!
-      self.action = ACTIONS.no_version
+    def no_version?
+      no_version
     end
 
-    def no_version?
-      self.action == ACTIONS.no_version
+    def no_version!
+      self.no_version = true
     end
 
     private
 
+      def get_output
+        if self.no_version? && self.version_constraint
+          raise InvalidFlags
+        end
+        if self.no_version?
+          return with_no_version
+        elsif self.version_constraint
+          return with_version_constraint
+        else
+          return "gem '#{name}', '#{version}'"
+        end
+      end
+
+      def with_no_version
+        "gem '#{name}'"
+      end
+
+      def with_version_constraint
+        case self.version_constraint
+        when "optimistic"
+          "gem '#{name}', '>= #{version}'"
+        when "pessimistic"
+          "gem '#{name}', '~> #{version}'"
+        end
+      end
+
       def platform_dependent?
         versions.count > 1
       end

data/lib/gemrat/gemfile.rb

@@ -28,12 +28,6 @@ module Gemrat
           f.close
         end
         puts "Updated '#{gem.name}' to version '#{gem.version}'.".green
-        needs_bundle!
-      elsif gem.no_version?
-        file.write "\ngem '#{gem.name}'"
-
-        puts "gem '#{gem.name}' added to your Gemfile.".green
-
         needs_bundle!
       end
     ensure
@@ -48,19 +42,19 @@ module Gemrat
       end
 
       def check(gem, file)
-        grep_file = file.grep(/.*#{gem.name}.*#{gem.version}.*/ )
-        raise DuplicateGemFound unless grep_file.empty?
-        current_gem_version = get_current_gem_version(gem, file)
+        @grep_file = file.grep(/gem.*#{gem.name}.*/)
+        @current_gem_version = get_current_gem_version
+        raise DuplicateGemFound if duplicate_gem? gem
 
-        return unless current_gem_version =~ /\S/
+        return unless @current_gem_version =~ /\S/
 
-        if current_gem_version < gem.version
-          prompt_gem_replacement(gem, current_gem_version)
+        if @current_gem_version < gem.version
+          prompt_gem_replacement(gem)
         end
       end
 
-      def prompt_gem_replacement(gem, gem_version)
-        print (Messages::NEWER_GEM_FOUND % [gem.name, gem.version, gem_version]).chomp + " "
+      def prompt_gem_replacement(gem)
+        print (Messages::NEWER_GEM_FOUND % [gem.name, gem.version, @current_gem_version]).chomp + " "
         case input
         when /n|no/
           gem.skip!
@@ -69,11 +63,12 @@ module Gemrat
         end
       end
 
-      def get_current_gem_version(gem, file)
-        file.rewind
-        gem_version = file.grep(/.*#{gem.name}.*/)
-        gem_version = gem_version.to_s.gsub(/[^\d|.]+/, '')
-        gem_version
+      def duplicate_gem? gem
+        !@grep_file.empty? && (@current_gem_version == gem.version || @current_gem_version.empty?)
+      end
+
+      def get_current_gem_version
+        @grep_file.to_s.match(/\d[\d|.]+/).to_s
       end
 
       def input

data/lib/gemrat/messages.rb

@@ -28,5 +28,11 @@ module Gemrat
     Gem '%s' already exists, but there is a newer version of the gem (v %s > v %s).
     Update version? (Y/n)
     NEWER_GEM_FOUND
+
+    INVALID_FLAGS = <<-INVALID_FLAGS
+
+    You have specified flags that are incompatile with each other. The most common cause
+    is specifiying the --no-version and --optimistic or --pessimistic flags together.
+    INVALID_FLAGS
   end
 end

data/lib/gemrat/runner.rb

@@ -28,7 +28,8 @@ module Gemrat
 
     private
 
-      attr_accessor :gems, :gemfile, :no_install, :no_version
+      attr_accessor :gems, :gemfile, :no_install, :no_version,
+        :version_constraint
 
       def parse_arguments(*args)
         Arguments.new(*args).tap do |a|
@@ -36,6 +37,7 @@ module Gemrat
           self.gemfile   = a.gemfile
           self.no_install = a.options.no_install
           self.no_version = a.options.no_version
+          self.version_constraint = a.options.version_constraint
         end
       end
 
@@ -48,16 +50,24 @@ module Gemrat
       rescue Gemfile::DuplicateGemFound
         puts Messages::DUPLICATE_GEM_FOUND % gem.name
         gem.invalid!
+      rescue Gem::InvalidFlags
+        puts Messages::INVALID_FLAGS.red
+        gem.invalid!
       end
 
       def for_each_gem
         gems && gems.each do |gem|
           set_no_version(gem)
+          set_version_constraint(gem)
           self.gem = gem
           yield
         end
       end
 
+      def set_version_constraint(gem)
+        gem.version_constraint = version_constraint
+      end
+
       def set_no_version(gem)
         if no_version
           gem.no_version!

data/lib/gemrat/version.rb

@@ -1,3 +1,3 @@
 module Gemrat
-  VERSION = "0.4.1"
+  VERSION = "0.4.5"
 end

data/spec/gemrat_spec.rb

@@ -80,8 +80,32 @@ describe Gemrat do
         it "runs bundle install" do
           output.should include("Bundling")
         end
+
+        ["when the --optimistic flag is given with the --no-version flag", "--optimistic",
+         "when the --pessimistic flag is given with the --no-version flag", "--pessimistic"].each_slice(2) do |ctx, flag|
+          context ctx do
+            let(:output) { capture_stdout { Gemrat::Runner.run("sinatra", "-g", "TestGemfile", "--no-version", flag) }}
+            it "should raise Invalid Flags error" do
+              output.should include(Gemrat::Messages::INVALID_FLAGS)
+            end
+          end
+        end
       end
 
+      ["when the --optimistic flag is given", "--optimistic", ">=",
+       "when the --pessimistic flag is given", "--pessimistic", "~>",
+       "when the -o flag is given", "-o", ">=",
+       "when the -p flag is given", "-p", "~>"].each_slice(3) do |ctx, flag, constraint|
+        context ctx do
+          let(:output) { capture_stdout { Gemrat::Runner.run("sinatra", "-g", "TestGemfile", flag) }}
+          it "should add the gem with appropriate version constraint" do
+            output.should include("gem 'sinatra', '#{constraint} 1.4.3'")
+            gemfile_contents = File.open('TestGemfile', 'r').read
+            gemfile_contents.should include("gem 'sinatra', '#{constraint} 1.4.3'")
+          end
+        end
+       end
+
       pending "when the --environment or -e flag is given" do
         let(:output) { capture_stdout { Gemrat::Runner.run("sinatra", "-g", "TestGemfile", "--environment test") }}
         it "adds the gem to the specifiyed environment" do
@@ -174,7 +198,6 @@ describe Gemrat do
   end
 
   context "when gem already exists in a gemfile" do
-
     context "and the gem is the newest version" do
       before do
         test_gemfile = File.open("TestGemfile", "w")
@@ -259,5 +282,53 @@ describe Gemrat do
         end
       end
     end
+
+    context "and the gem doesn't have a version specified" do
+      before do
+        test_gemfile = File.open("TestGemfile", "w")
+        test_gemfile << %Q{https://rubygems.org'
+                           # Specify your gem's dependencies in gemrat.gemspec
+                           gem 'minitest'}
+        test_gemfile.close
+      end
+
+      let!(:output) { capture_stdout { Gemrat::Runner.run("minitest", "-g", "TestGemfile")} }
+
+      it "informs that a gem already exists" do
+        output.should include("gem 'minitest' already exists")
+      end
+
+      it "doesn't add the gem to the gemfile" do
+        File.read("TestGemfile").should_not match(/minitest.+5\.0\.5/)
+      end
+
+      it "doesn't touch the old gem in the gemfile" do
+        File.read("TestGemfile").should match(/minitest.$/)
+      end
+    end
+
+    context "the gem doesn't have a version specified and is mentioned in the comments (turbolinks issue)" do
+      before do
+        test_gemfile = File.open("TestGemfile", "w")
+        test_gemfile << %Q{https://rubygems.org'
+                               # Specify your gem's dependencies in gemrat.gemspec
+                               # Read more: https://github.com/rails/turbolinks
+                               gem 'turbolinks'}
+        test_gemfile.close
+      end
+
+      let!(:output) { capture_stdout { Gemrat::Runner.run("turbolinks", "-g", "TestGemfile") }}
+      it "should not prompt for a replacement" do
+        output.should_not include("there is a newer version of the gem")
+      end
+
+      it "should notify you that the gem already exists and abort" do
+        output.should include("gem 'turbolinks' already exists in your Gemfile. Skipping...")
+      end
+
+      it "doesn't add the gem to the gemfile" do
+        File.read("TestGemfile").should_not match(/turbolinks.+1\.2\.0/)
+      end
+    end
   end
 end

data/spec/resources/rubygems_response_shim_for_turbolinks

@@ -0,0 +1,5 @@
+turbolinks (1.2.0)
+turbolinks-analytics (0.0.1)
+turbolinks-js (0.6.1)
+turbolinks-redirect (0.0.1)
+turbolinks_transitions (0.0.5)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemrat
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.5
 platform: ruby
 authors:
 - Dru Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -127,6 +127,7 @@ files:
 - spec/resources/rubygems_response_shim_for_rails
 - spec/resources/rubygems_response_shim_for_sinatra
 - spec/resources/rubygems_response_shim_for_thin
+- spec/resources/rubygems_response_shim_for_turbolinks
 - spec/spec_helper.rb
 homepage: https://github.com/DruRly/gemrat
 licenses:
@@ -159,4 +160,5 @@ test_files:
 - spec/resources/rubygems_response_shim_for_rails
 - spec/resources/rubygems_response_shim_for_sinatra
 - spec/resources/rubygems_response_shim_for_thin
+- spec/resources/rubygems_response_shim_for_turbolinks
 - spec/spec_helper.rb