git-smart 0.1.8 → 0.1.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 64ad55375b56d448e73868a6f94752cfdff26dc5ab5fda21c36e4ee25e7388cf
+  data.tar.gz: 795a52c8fc520bbc3c37cdc5b66b36a2482f9820f19e1da6cdebd8365a1531bd
+SHA512:
+  metadata.gz: c5c6c4acd4930017ea59a695a457232f62fc18807adbf6f93ec65f73289cb9377cbd8fb9a00758ce78e44ee76b29cf979451db27c21313ead3a6f21d7806a331
+  data.tar.gz: 9644dcbaaa3e69c34f53d42c87b21cf8aacd29ec7b6d8241694882dcdbcd0c1e1670a0b40354c70cc7d4b3f467a312349295fa85c7ea235344cfceeabbfd915e

data/Gemfile

@@ -1,9 +1,10 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'colorize'
 
 group :development do
   gem 'rspec'
-  gem 'rcov'
+  gem 'simplecov'
   gem 'rocco'
+  gem 'rake'
 end

data/Gemfile.lock

@@ -1,10 +1,12 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     colorize (0.5.8)
     diff-lcs (1.1.3)
+    docile (1.1.1)
+    multi_json (1.8.2)
     mustache (0.99.4)
-    rcov (0.9.11)
+    rake (10.0.3)
     redcarpet (1.17.2)
     rocco (0.8.2)
       mustache
@@ -17,12 +19,18 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   colorize
-  rcov
+  rake
   rocco
   rspec
+  simplecov

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.11

data/lib/git-smart/git_repo.rb

@@ -1,13 +1,41 @@
+# encoding: utf-8
+
+require 'yaml'
+require 'pathname'
+
 class GitRepo
   def initialize(dir)
     @dir = dir
-    if !File.exists? File.join(@dir, ".git")
-      raise GitSmart::RunFailed.new("You need to run this from within a git directory")
+    unless File.directory?(git_dir)
+      raise GitSmart::RunFailed.new(
+        <<-MSG.gsub(/^\s+/, '')
+        You need to run this from within a Git directory.
+        Current working directory: #{File.expand_path(dir)}
+        Expected .git directory: #{git_dir}
+        MSG
+      )
     end
   end
 
+  def git_dir
+    gitdir = Pathname.new(@dir).join('.git')
+
+    unless File.exists?(gitdir)
+      @dir = git('rev-parse', '--show-toplevel').chomp
+      gitdir = Pathname.new(@dir).join('.git') unless @dir.empty?
+    end
+
+    if File.file?(gitdir)
+      submodule = YAML.load_file(gitdir)
+      gitdir = Pathname.new(@dir).join(submodule['gitdir']).to_path
+    end
+
+    gitdir
+  end
+
   def current_branch
-    File.read(File.join(@dir, ".git", "HEAD")).strip.sub(/^.*refs\/heads\//, '')
+    head_file = File.join(git_dir, 'HEAD')
+    File.read(head_file).strip.sub(%r(^.*refs/heads/), '')
   end
 
   def sha(ref)
@@ -87,7 +115,7 @@ class GitRepo
   end
 
   def rebase_preserving_merges!(upstream)
-    git!('rebase', '-p', upstream)
+    git!('rebase', '--rebase-merges', upstream)
   end
 
   def read_log(nr)
@@ -136,6 +164,7 @@ class GitRepo
   private
 
   def exec_git(*args)
+    return if @dir.empty?
     Dir.chdir(@dir) {
       SafeShell.execute('git', *args)
     }

data/spec/smart-merge_failures_spec.rb

@@ -11,6 +11,9 @@ describe 'smart-merge with failures' do
         mkdir local
         cd local
           git init
+          git config --local user.name 'Maxwell Smart'
+          git config --local user.email 'agent86@control.gov'
+          git config --local core.pager 'cat'
           echo -e 'one\ntwo\nthree\nfour\n' > README
           mkdir lib
           echo 'puts "pro hax"' > lib/codes.rb

data/spec/smart-merge_spec.rb

@@ -11,6 +11,9 @@ describe 'smart-merge' do
         mkdir local
         cd local
           git init
+          git config --local user.name 'Maxwell Smart'
+          git config --local user.email 'agent86@control.gov'
+          git config --local core.pager 'cat'
           echo 'hurr durr' > README
           mkdir lib
           echo 'puts "pro hax"' > lib/codes.rb
@@ -58,7 +61,7 @@ describe 'smart-merge' do
       out.should report("Branch 'newbranch' has diverged by 1 commit. Merging in.")
       out.should report("* Branch 'master' has not moved on since 'newbranch' diverged. Running with --no-ff anyway, since a fast-forward is unexpected behaviour.")
       out.should report("Executing: git merge --no-ff newbranch")
-      out.should report("2 files changed, 2 insertions(+), 0 deletions(-)")
+      out.should report(/2 files changed, 2 insertions\(\+\)(, 0 deletions\(-\))?$/)
       out.should report(/All good\. Created merge commit [\w]{7}\./)
     end
 
@@ -77,7 +80,7 @@ describe 'smart-merge' do
         out.should report("Branch 'newbranch' has diverged by 1 commit. Merging in.")
         out.should report("Branch 'master' has 1 new commit since 'newbranch' diverged.")
         out.should report("Executing: git merge --no-ff newbranch")
-        out.should report("2 files changed, 2 insertions(+), 0 deletions(-)")
+        out.should report(/2 files changed, 2 insertions\(\+\)(, 0 deletions\(-\))?$/)
         out.should report(/All good\. Created merge commit [\w]{7}\./)
       end
 
@@ -91,7 +94,7 @@ describe 'smart-merge' do
         out = run_command(local_dir, 'smart-merge', 'newbranch')
         out.should report("Executing: git stash")
         out.should report("Executing: git merge --no-ff newbranch")
-        out.should report("2 files changed, 2 insertions(+), 0 deletions(-)")
+        out.should report(/2 files changed, 2 insertions\(\+\)(, 0 deletions\(-\))?$/)
         out.should report("Reapplying local changes...")
         out.should report("Executing: git stash pop")
         out.should report(/All good\. Created merge commit [\w]{7}\./)

data/spec/smart-pull_spec.rb

@@ -12,14 +12,20 @@ describe 'smart-pull' do
         mkdir remote
         cd remote
           git init
+          git config --local user.name 'Maxwell Smart'
+          git config --local user.email 'agent86@control.gov'
+          git config --local core.pager 'cat'
           echo 'hurr durr' > README
           mkdir lib
           echo 'puts "pro hax"' > lib/codes.rb
           git add .
           git commit -m 'first'
         cd ..
-
         git clone remote/.git local
+        cd local
+          git config --local user.name 'Agent 99'
+          git config --local user.email 'agent99@control.gov'
+          git config --local core.pager 'cat'
     ]
   end
 
@@ -68,7 +74,7 @@ describe 'smart-pull' do
       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 [^\.]+..[^\.]+/)
-      out.should report("1 files changed, 1 insertions(+), 0 deletions(-)")
+      out.should report(/1 files? changed, 1 insertions?\(\+\)(, 0 deletions\(-\))?$/)
     end
 
     it "should not stash before fast-forwarding if untracked files are present" do
@@ -79,7 +85,7 @@ describe 'smart-pull' do
       local_dir.should have_git_status({:untracked => ['noob']})
       out = run_command(local_dir, 'smart-pull')
       out.should report("Executing: git merge --ff-only origin/master")
-      out.should report("1 files changed, 1 insertions(+), 0 deletions(-)")
+      out.should report(/1 files? changed, 1 insertions?\(\+\)(, 0 deletions\(-\))?$/)
       local_dir.should have_git_status({:untracked => ['noob']})
     end
 
@@ -95,7 +101,7 @@ describe 'smart-pull' do
       out.should report("Working directory dirty. Stashing...")
       out.should report("Executing: git stash")
       out.should report("Executing: git merge --ff-only origin/master")
-      out.should report("1 files changed, 1 insertions(+), 0 deletions(-)")
+      out.should report(/1 files? changed, 1 insertions?\(\+\)(, 0 deletions\(-\))?$/)
       out.should report("Reapplying local changes...")
       out.should report("Executing: git stash pop")
       local_dir.should have_git_status({:added => ['noob'], :modified => ['lib/codes.rb']})
@@ -159,4 +165,51 @@ describe 'smart-pull' do
       local_dir.should have_last_few_commits(['local changes', 'upstream changes', 'first'])
     end
   end
+
+  context 'with a submodule' do
+    before do
+      %x[
+      cd #{WORKING_DIR}
+        mkdir submodule
+        cd submodule
+          git init
+          git config --local user.name 'The Chief'
+          git config --local user.email 'agentq@control.gov'
+          git config --local core.pager 'cat'
+          echo 'Unusual, but effective.' > README
+          git add .
+          git commit -m 'first'
+        cd ..
+        cd local
+          git submodule add "${PWD}/../submodule/.git" submodule
+          git commit -am 'Add submodule'
+      ]
+    end
+    let(:submodule_dir) { local_dir + '/submodule' }
+
+    it 'can smart-pull the repo containing the submodule' do
+      out = run_command(local_dir, 'smart-pull')
+      out.should report('Executing: git fetch origin')
+      out.should report("Remote branch 'origin/master' has not moved on.")
+      out.should report("You have 1 new commit on 'master'.")
+    end
+
+    it 'can smart-pull the submodule' do
+      out = run_command(submodule_dir, 'smart-pull')
+      out.should report('Executing: git fetch origin')
+      out.should report("Neither your local branch 'master', nor the remote branch 'origin/master' have moved on.")
+      out.should report('Already up-to-date')
+    end
+  end
+
+  context 'outside of a repo' do
+    it 'should report a meaningful error' do
+      Dir.mktmpdir do |non_repo_dir|
+        out = run_command(non_repo_dir, 'smart-pull')
+        out.should report 'You need to run this from within a Git directory'
+        out.should report 'Current working directory: '
+        out.should report 'Expected .git directory: '
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rspec'
+require 'tmpdir'
 
 require File.dirname(__FILE__) + '/../lib/git-smart'
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-smart
 version: !ruby/object:Gem::Version
-  version: 0.1.8
-  prerelease: 
+  version: 0.1.11
 platform: ruby
 authors:
 - Glen Maddern
@@ -13,48 +12,60 @@ date: 2011-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70270124318420 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270124318420
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70270124317920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70270124317920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70270124317440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270124317440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rocco
-  requirement: &70270124316960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270124316960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Installs some additional 'smart' git commands, like `git smart-pull`.
 email: glenmaddern@gmail.com
 executables:
@@ -66,6 +77,15 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
+- README.md
+- Rakefile
+- VERSION
+- bin/git-smart-log
+- bin/git-smart-merge
+- bin/git-smart-pull
 - docs/images/git-smart.png
 - docs/images/smart-log-comparison.png
 - docs/images/smart-pull-screenshot.png
@@ -85,46 +105,32 @@ files:
 - lib/git-smart/git_repo.rb
 - lib/git-smart/git_smart.rb
 - lib/git-smart/safe_shell.rb
-- Gemfile
-- Gemfile.lock
-- LICENSE.txt
-- README.md
-- Rakefile
-- VERSION
 - spec/smart-merge_failures_spec.rb
 - spec/smart-merge_spec.rb
 - spec/smart-pull_spec.rb
 - spec/spec_helper.rb
-- !binary |-
-  YmluL2dpdC1zbWFydC1sb2c=
-- !binary |-
-  YmluL2dpdC1zbWFydC1tZXJnZQ==
-- !binary |-
-  YmluL2dpdC1zbWFydC1wdWxs
 homepage: http://github.com/geelen/git-smart
 licenses:
 - MIT
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 3.0.3.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Add some smarts to your git workflow
 test_files:
 - spec/smart-merge_failures_spec.rb