git_er_done 0.1.0 → 0.3.0

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+.idea/*
+tmp/*

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.2
+rvm use 1.9.2@rails3.0

data/Gemfile

@@ -2,3 +2,11 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in git_er_done.gemspec
 gemspec
+
+group :development do
+  gem 'rake'
+end
+group :test do
+  gem 'cucumber'
+  gem 'aruba'
+end

data/README.md

@@ -9,6 +9,14 @@ This project exists for a few reasons:
 3. Gives an interesting test case for my Thor talk at DCRUG and Arlington RUG.
 4. Make doing the 'right' thing easy (i.e. feature branches should be simple. Smaller projects)
 
+## Installation
+
+```
+gem install git_er_done
+```
+
+This makes the `gd` command available on your system.
+
 ## Syntax
 
 Things you can do:

data/Rakefile

@@ -1 +1,9 @@
 require 'bundler/gem_tasks'
+
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new
+
+desc 'Run all tests'
+task :test => :cucumber
+
+task :default => :test

data/features/cli.feature

@@ -0,0 +1,30 @@
+Feature: CLI
+
+  In order to make doing the right thing easier in Git
+  As a programmer with a bad memory
+  I should be able to use a commandline tool to simplify my interface.
+
+  Scenario: Show the Version of the Gem
+    When I run `gd version`
+    Then the output should contain "Git-Er-Done"
+    And should display the current version
+
+  Scenario: Show version using -v
+    When I run `gd -v`
+    Then the output should contain "Git-Er-Done"
+    And should display the current version
+
+  Scenario: Start a New Feature
+    Given I am working on a git project
+    When I run `gd feature new_widget`
+    Then the output should contain "Switched to a new branch 'features/new_widget'"
+
+  Scenario: Sync a Branch
+    Given I am working on a git project
+    And I am working on the "features/new_widget" branch
+    When I run `gd sync`
+    Then the output should contain "Switched to branch 'master'"
+    And the output should contain "Switched to branch 'features/new_widget"
+    And the output should contain "Current branch features/new_widget is up to date"
+
+  

data/features/step_definitions/cli_steps.rb

@@ -0,0 +1,15 @@
+Given /^I am working on a git project$/ do
+  steps %Q{
+    Given I run `git init .`
+    And an empty file named "README"
+    And I run `git add README`
+    And I run `git commit -m 'First commit'`
+  }
+end
+
+Given /^I am working on the "(.*)" branch$/ do |branch|
+  steps "Given I run `git checkout -b #{branch}`"
+end
+When /^should display the current version$/ do
+  assert_partial_output(Git::Er::Done::VERSION, all_output)
+end

data/features/support.rb/env.rb

@@ -0,0 +1,5 @@
+require 'aruba/cucumber'
+
+# For loading the library in tests.
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../../lib'))
+require 'git_er_done'

data/git_er_done.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  [['thor', '~> 0.14.6'], ['rails', '~> 3.0.9'], ['grit', '~>2.4']].each do |gem, version|
+  [['thor', '~> 0.14.6'], ['grit', '~>2.4']].each do |gem, version|
     s.add_dependency(gem, version)
   end
 end

data/lib/git_er_done/actions.rb

@@ -0,0 +1,21 @@
+module Git
+  module Er
+    module Done
+      module Actions
+        
+        # Run a git command.
+        # This is basically a straight copy/paste from http://api.rubyonrails.org/classes/Rails/Generators/Actions.html#method-i-git
+        # Avoids dragging in the entire rails stack for this one command.
+        def git(command={})
+          if command.is_a?(Symbol)
+            run "git #{command}"
+          else
+            command.each do |cmd, options|
+              run "git #{cmd} #{options}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_er_done/app.rb

@@ -1,6 +1,6 @@
 require 'thor'
-require 'rails/generators/actions'
 require 'grit'
+require 'git_er_done/actions'
 
 module Git
   module Er
@@ -8,7 +8,7 @@ module Git
       class App < Thor
         
         include Thor::Actions
-        include Rails::Generators::Actions
+        include Git::Er::Done::Actions
         
         FEATURES_PATH = "features/"
         
@@ -36,25 +36,46 @@ module Git
         
         desc 'squash', 'Squash all commits from the current branch into a single commit.'
         def squash
+          new_commits = commits_in_feature_branch.size
+          if new_commits < 2
+            puts "Only '#{new_commits}' new commits in this branch, so no squashing necessary."
+            return
+          end
           # Squash all changes since we branched away from master
           git :rebase => "-i master"
         end
         
+        desc 'info', "Report information about the current feature branch you are in."
+        def info
+          commits = commits_in_feature_branch
+          puts "There are #{commits.size} new commits for #{current_branch_name}"
+        end
+        
         desc 'sync', 'Update your branch with the latest from master.'
         def sync
-          return_to_branch = current_branch
+          return_to_branch = current_branch_name
           git :checkout => :master
           git :pull
           git :checkout => return_to_branch
           git :rebase => :master
         end
-        
+
+        desc 'version', 'Show the Git-Er-Done version and quit. (gd -v works too)'
+        map "-v" => :version
+        def version
+          puts "Git-Er-Done #{Git::Er::Done::VERSION}"
+        end
         private
         
+        # Returns a list of all commits for the current branch since it was forked from master.
+        def commits_in_feature_branch
+          repo.commits_between(master_branch.name, current_branch.name)
+        end
+        
         # Returns the name of the feature for the current branch
         # @return [String] Name of feature (not include features/)
         def current_feature
-          b = current_branch
+          b = current_branch_name
           if b.start_with?(FEATURES_PATH)
             return b[FEATURES_PATH.length, b.length]
           end
@@ -62,13 +83,24 @@ module Git
         end
         
         def current_branch
-          repo.head.name
+          repo.head
+        end
+        
+        def current_branch_name
+          current_branch.name
         end
         
         def repo
           repo ||= Grit::Repo.new('.')
         end
         
+        def master_branch
+          repo.heads.each do |head|
+            return head if head.name == "master"
+          end
+          raise "No branch named 'master' found."
+        end
+        
         def feature_branch(name)  
           "#{FEATURES_PATH}#{name}"
         end

data/lib/git_er_done/version.rb

@@ -1,7 +1,7 @@
 module Git
   module Er
     module Done
-      VERSION = "0.1.0"
+      VERSION = "0.3.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_er_done
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-28 00:00:00.000000000Z
+date: 2012-01-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153491080 !ruby/object:Gem::Requirement
+  requirement: &70179246615980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153491080
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &2153490500 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: *2153490500
+  version_requirements: *70179246615980
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &2153490080 !ruby/object:Gem::Requirement
+  requirement: &70179246615400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +32,7 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2153490080
+  version_requirements: *70179246615400
 description: A gem to assist with git workflow, similar to git-flow.
 email:
 - peakpg@gmail.com
@@ -58,8 +47,12 @@ files:
 - README.md
 - Rakefile
 - bin/gd
+- features/cli.feature
+- features/step_definitions/cli_steps.rb
+- features/support.rb/env.rb
 - git_er_done.gemspec
 - lib/git_er_done.rb
+- lib/git_er_done/actions.rb
 - lib/git_er_done/app.rb
 - lib/git_er_done/version.rb
 homepage: ''
@@ -82,8 +75,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: git_er_done
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A gem to assist with git workflow.
-test_files: []
+test_files:
+- features/cli.feature
+- features/step_definitions/cli_steps.rb
+- features/support.rb/env.rb