bundler-auto-update 0.0.4 → 0.1.0

data/Gemfile

@@ -3,3 +3,5 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in bundler-auto-update.gemspec
 gemspec
 
+gem 'rake'
+

data/lib/bundler_auto_update.rb

@@ -84,6 +84,11 @@ module Bundler
         end
       end
 
+      # @return true when the gem has a fixed version.
+      def updatable?
+        !!(gem.version =~ /^~?>? ?\d+\.\d+(\.\d+)?$/)
+      end
+
       private
 
       # Update gem version in Gemfile.
@@ -111,14 +116,15 @@ module Bundler
         end
       end
 
-      # @return true when the gem has a fixed version.
-      def updatable?
-        gem.version =~ /^\d+\.\d+\.\d+$/
-      end
-
       def commit_new_version
         Logger.log_indent "Committing changes"
-        CommandRunner.system "git commit Gemfile Gemfile.lock -m 'Auto update #{gem.name} to version #{gem.version}'"
+
+        files_to_commit = if CommandRunner.system "git status | grep 'Gemfile.lock'"
+                            "Gemfile Gemfile.lock"
+                          else
+                            "Gemfile"
+                          end
+        CommandRunner.system "git commit #{files_to_commit} -m 'Auto update #{gem.name} to version #{gem.version}'"
       end
 
       def revert_to_previous_version
@@ -133,7 +139,7 @@ module Bundler
       # Regex that matches a gem definition line.
       #
       # @return [RegEx] matching [_, name, _, version, _, options]
-      def gem_line_regex(gem_name = '(\w+)')
+      def gem_line_regex(gem_name = '([\w-]+)')
         /^\s*gem\s*['"]#{gem_name}['"]\s*(,\s*['"](.+)['"])?\s*(,\s*(.*))?\n?$/
       end
 
@@ -230,7 +236,8 @@ module Bundler
       def initialize(name, version = nil, options = nil)
         @name, @version, @options = name, version, options
 
-        @major, @minor, @patch = version.split('.') if version
+        # TODO: enhance support of > and ~> in versions
+        @major, @minor, @patch = version[/\d+\.\d+(\.\d+)?/].split('.') if version
       end
 
       # Return last version scoped at :version_type:.

data/lib/bundler_auto_update/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module AutoUpdate
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

data/spec/unit/gem_updater_spec.rb

@@ -82,5 +82,20 @@ describe GemUpdater do
     end
   end # describe "#update"
 
+  describe "updatable?" do
+    [ "1.0.0", "> 1.0.0", "~> 1.0.0", "1.0", ].each do |version|
+      it "should be updatable when version is #{version}" do
+        dependency = Dependency.new('rails', version)
+        GemUpdater.new(dependency, nil, nil).should be_updatable
+      end
+    end
+
+    it "should be updatable when version is < 1.0.0" do
+      dependency = Dependency.new('rails', '< 1.0.0')
+      GemUpdater.new(dependency, nil, nil).should_not be_updatable
+    end
+  end
+
+
 end
 

data/spec/unit/gemfile_spec.rb

@@ -5,7 +5,9 @@ describe Gemfile do
 source :rubygems
 
 gem 'rails',  "3.0.0"
- gem 'rake' , '< 0.9' 
+group :test do
+  gem 'shoulda-matchers' , '~> 0.9' 
+end
 gem 'mysql', :git => "git://...."
 EOF
 }
@@ -40,8 +42,8 @@ EOF
       describe "second gem" do
         subject { gemfile.gems[1] }
 
-        its(:name) { should == 'rake' }
-        its(:version) { should == '< 0.9' }
+        its(:name) { should == 'shoulda-matchers' }
+        its(:version) { should == '~> 0.9' }
         its(:options) { should be_nil }
       end
 

metadata

@@ -1,77 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bundler-auto-update
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Philippe Creux
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-13 00:00:00 +02:00
-default_executable: bundle-auto-update
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70213822217080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70213822217080
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70213822216080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70213822216080
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &70213822214920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        - 6
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.4.6
   type: :development
-  version_requirements: *id003
-description: Attempt to update every single gem of your Gemfile to its latest patch, minor then major release. Runs a test command to ensure the update succeeded
-email: 
+  prerelease: false
+  version_requirements: *70213822214920
+description: Attempt to update every single gem of your Gemfile to its latest patch,
+  minor then major release. Runs a test command to ensure the update succeeded
+email:
 - pcreux@gmail.com
-executables: 
+executables:
 - bundle-auto-update
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -87,39 +68,41 @@ files:
 - spec/unit/dependency_spec.rb
 - spec/unit/gem_updater_spec.rb
 - spec/unit/gemfile_spec.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4045362081807773718
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -4045362081807773718
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Auto update your Gemfile
-test_files: []
-
+test_files:
+- features/bundler_auto_update.feature
+- features/support/env.rb
+- spec/spec_helper.rb
+- spec/unit/cli_spec.rb
+- spec/unit/dependency_spec.rb
+- spec/unit/gem_updater_spec.rb
+- spec/unit/gemfile_spec.rb