git-smart 0.1.1 → 0.1.2

data/Gemfile

@@ -5,7 +5,6 @@ gem 'colorize'
 group :development do
   gem "rspec", "~> 2.3.0"
   gem "rcov", ">= 0"
-  gem 'ruby-debug'
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
 end

data/Gemfile.lock

@@ -2,14 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     colorize (0.5.8)
-    columnize (0.3.2)
     diff-lcs (1.1.2)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    linecache (0.43)
     rake (0.8.7)
     rcov (0.9.8)
     rspec (2.3.0)
@@ -20,11 +18,6 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
 
 PLATFORMS
   ruby
@@ -35,4 +28,3 @@ DEPENDENCIES
   jeweler (~> 1.5.2)
   rcov
   rspec (~> 2.3.0)
-  ruby-debug

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/git-smart.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-smart}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Glen Maddern"]
@@ -58,14 +58,12 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<colorize>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
     else
       s.add_dependency(%q<colorize>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     end
@@ -73,7 +71,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<colorize>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
   end

data/lib/git-smart/exceptions.rb

@@ -1,2 +1,10 @@
-class GitSmart::RunFailed < Exception; end
-class GitSmart::UnexpectedOutput < Exception; end
+class GitSmart
+  class Exception < ::RuntimeError
+    def initialize(msg = '')
+      super(msg)
+    end
+  end
+
+  class RunFailed < Exception; end
+  class UnexpectedOutput < Exception; end
+end

data/lib/git-smart/git_repo.rb

@@ -1,6 +1,9 @@
 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")
+    end
   end
 
   def current_branch
@@ -55,9 +58,9 @@ class GitRepo
       map_values { |lines| lines.map(&:last) }.
       map_keys { |status|
         case status
-          when /^M/: :modified
-          when /^A/: :added
-          when /^\?\?/: :untracked
+          when /^M/; :modified
+          when /^A/; :added
+          when /^\?\?/; :untracked
           else raise GitSmart::UnexpectedOutput.new("Expected the output of git status to only have lines starting with A,M, or ??. Got: \n#{raw_status}")
         end
       }

data/lib/git-smart/git_smart.rb

@@ -4,7 +4,10 @@ class GitSmart
     if lambda
       begin
         lambda.call(args)
-      rescue GitSmart::RunFailed
+      rescue GitSmart::Exception => e
+        if e.message && !e.message.empty?
+          puts e.message.red
+        end
       end
     else
       puts "No command #{code.inspect} defined! Available commands are #{commands.keys.sort.inspect}"

data/spec/smart-pull_spec.rb

@@ -62,7 +62,7 @@ describe 'smart-pull' do
     it "should fast-forward" do
       out = run_command(local_dir, 'smart-pull')
       out.should report("Executing: git fetch origin")
-      out.should report(/master +-> +origin\/master/)      
+      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("Local branch 'master' has not moved on. Fast-forwarding.")

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'ruby-debug'
 require 'rspec'
 
 require File.dirname(__FILE__) + '/../lib/git-smart'

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: git-smart
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Glen Maddern
@@ -19,95 +18,76 @@ date: 2011-01-04 00:00:00 +11:00
 default_executable: git-smart
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: colorize
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 3
         - 0
         version: 2.3.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  name: ruby-debug
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 5
         - 2
         version: 1.5.2
-  requirement: *id006
+  type: :development
+  prerelease: false
+  version_requirements: *id005
 description: Installs some additional 'smart' git commands, like `git smart-pull`.
 email: glenmaddern@gmail.com
 executables: 
@@ -152,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -40968980638764518
       segments: 
       - 0
       version: "0"
@@ -161,7 +141,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"