git-smart 0.1.3 → 0.1.4

data/spec/smart-pull_spec.rb

@@ -63,8 +63,7 @@ describe 'smart-pull' do
       out = run_command(local_dir, 'smart-pull')
       out.should report("Executing: git fetch origin")
       out.should report(/master +-> +origin\/master/)
-      out.should report("There is 1 new commit on master.")
-      out.should report("No uncommitted changes, no need to stash.")
+      out.should report("There is 1 new commit on 'origin/master'.")
       out.should report("Local branch 'master' has not moved on. Fast-forwarding.")
       out.should report("Executing: git merge --ff-only origin/master")
       out.should report(/Updating [^\.]+..[^\.]+/)
@@ -78,7 +77,6 @@ describe 'smart-pull' do
       ]
       local_dir.should have_git_status({:untracked => ['noob']})
       out = run_command(local_dir, 'smart-pull')
-      out.should report("No uncommitted changes, no need to stash.")
       out.should report("Executing: git merge --ff-only origin/master")
       out.should report("1 files changed, 1 insertions(+), 0 deletions(-)")
       local_dir.should have_git_status({:untracked => ['noob']})
@@ -122,7 +120,7 @@ describe 'smart-pull' do
       out = run_command(local_dir, 'smart-pull')
       out.should report("Executing: git fetch origin")
       out.should report(/master +-> +origin\/master/)
-      out.should report("There is 1 new commit on master.")
+      out.should report("There is 1 new commit on 'origin/master'.")
       out.should report("Both local and remote branches have moved on. Branch 'master' needs to be rebased onto 'origin/master'")
       out.should report("Executing: git rebase -p origin/master")
       out.should report("Successfully rebased and updated refs/heads/master.")
@@ -136,7 +134,6 @@ describe 'smart-pull' do
       ]
       local_dir.should have_git_status({:untracked => ['noob']})
       out = run_command(local_dir, 'smart-pull')
-      out.should report("No uncommitted changes, no need to stash.")
       out.should report("Executing: git rebase -p origin/master")
       out.should report("Successfully rebased and updated refs/heads/master.")
       local_dir.should have_git_status({:untracked => ['noob']})

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ WORKING_DIR = File.dirname(__FILE__) + '/working'
 
 RSpec.configure do |config|
   config.before :each do
+    FileUtils.rm_rf WORKING_DIR
     FileUtils.mkdir_p WORKING_DIR
   end
 
@@ -14,7 +15,7 @@ RSpec.configure do |config|
   end
 end
 
-def run_command(dir, command, args = [])
+def run_command(dir, command, *args)
   require 'stringio'
   $stdout = stdout = StringIO.new
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-smart
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Glen Maddern
@@ -14,80 +15,99 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 +11:00
+date: 2011-01-05 00:00:00 +11:00
 default_executable: git-smart
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   name: colorize
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: rspec
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 3
         - 0
         version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: rcov
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 5
         - 2
         version: 1.5.2
-  type: :development
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *id005
+  type: :development
+  name: rocco
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
 description: Installs some additional 'smart' git commands, like `git smart-pull`.
 email: glenmaddern@gmail.com
 executables: 
@@ -105,7 +125,11 @@ files:
 - Rakefile
 - VERSION
 - bin/git-smart
+- docs/images/git-smart.png
+- docs/smart-merge.html
+- docs/smart-pull.html
 - git-smart.gemspec
+- lib/commands/smart-merge.rb
 - lib/commands/smart-pull.rb
 - lib/core_ext/array.rb
 - lib/core_ext/hash.rb
@@ -116,6 +140,8 @@ files:
 - lib/git-smart/git_repo.rb
 - lib/git-smart/git_smart.rb
 - lib/git-smart/safe_shell.rb
+- spec/smart-merge_failures_spec.rb
+- spec/smart-merge_spec.rb
 - spec/smart-pull_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -132,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3906371791239311592
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -141,6 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -152,5 +179,7 @@ signing_key:
 specification_version: 3
 summary: Add some smarts to your git workflow
 test_files: 
+- spec/smart-merge_failures_spec.rb
+- spec/smart-merge_spec.rb
 - spec/smart-pull_spec.rb
 - spec/spec_helper.rb