git-topic 0.1.5 → 0.1.6.2

data/Gemfile

@@ -2,17 +2,15 @@
 
 source :gemcutter
 
-gem 'git-topic'
-
 group :runtime do
-  gem 'activesupport'
+  gem 'activesupport',  '>= 3.0.0.beta4'
   gem 'trollop'
 end
 
 group :development do
   gem 'jeweler'
   gem 'rake'
-  gem 'rspec',  '>= 2.0.0.beta.16'
+  gem 'rspec',          '>= 2.0.0.beta.16'
   gem 'ZenTest'
   gem 'yard'
   gem 'gemcutter'

data/Gemfile.lock

@@ -2,26 +2,25 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.3.3)
-    activesupport (2.3.8)
+    activesupport (3.0.0.beta4)
     diff-lcs (1.1.2)
     gemcutter (0.5.0)
       json_pure
     git (1.2.5)
-    git-topic (0.1.4)
     jeweler (1.4.0)
       gemcutter (>= 0.1.0)
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
     json_pure (1.4.3)
     rake (0.8.7)
-    rspec (2.0.0.beta.16)
-      rspec-core (= 2.0.0.beta.16)
-      rspec-expectations (= 2.0.0.beta.16)
-      rspec-mocks (= 2.0.0.beta.16)
-    rspec-core (2.0.0.beta.16)
-    rspec-expectations (2.0.0.beta.16)
+    rspec (2.0.0.beta.17)
+      rspec-core (= 2.0.0.beta.17)
+      rspec-expectations (= 2.0.0.beta.17)
+      rspec-mocks (= 2.0.0.beta.17)
+    rspec-core (2.0.0.beta.17)
+    rspec-expectations (2.0.0.beta.17)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.16)
+    rspec-mocks (2.0.0.beta.17)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     trollop (1.16.2)
@@ -32,9 +31,8 @@ PLATFORMS
 
 DEPENDENCIES
   ZenTest
-  activesupport
+  activesupport (>= 3.0.0.beta4)
   gemcutter
-  git-topic
   jeweler
   rake
   rspec (>= 2.0.0.beta.16)

data/Rakefile

@@ -1,3 +1,5 @@
+require 'yaml'
+
 require 'rubygems'
 require 'rake'
 
@@ -62,6 +64,21 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
+
+desc "Write out build version.  You must supply BUILD."
+task 'version:write:build' do
+  unless ENV.has_key? 'BUILD'
+    abort "Must supply BUILD=<build> to write out build version number." 
+  end
+  y = YAML::load_file( "VERSION.yml" )
+  v = {
+    :major => 0, :minor => 0, :patch => 0, :build => 0
+  }
+  v.merge!( y ) if y.is_a? Hash
+  v[ :build ] = ENV['BUILD']
+  File.open( "VERSION.yml", "w" ){|f| f.puts YAML::dump( v )}
+end
+
 desc "Run all specs."
 task :spec do
   sh "bundle exec rspec spec"

data/VERSION.yml

@@ -0,0 +1,5 @@
+--- 
+:major: 0
+:minor: 1
+:patch: 6
+:build: "2"

data/bin/git-topic

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
+require 'yaml'
+
 require 'rubygems'
-require 'bundler'
-Bundler.setup :default, :runtime
 
 require 'trollop'
 require 'git_topic'
@@ -11,22 +11,33 @@ require 'git_topic'
 
 module GitTopic
   SubCommands = %w(work-on done status review accept reject install-aliases)
+  Version = lambda {
+    h = YAML::load_file( "#{File.dirname( __FILE__ )}/../VERSION.yml" )
+    if h.is_a? Hash
+      [h[:major], h[:minor], h[:patch], h[:build]].compact.join( "." )
+    end
+  }.call
+  GlobalOptKeys = [ :verbose, :help, :verbose_given, :version ]
 
   class << self
     def run
       global_opts = Trollop::options do
         banner "
+          git-topic #{Version}
           Manage a topic/review workflow.
 
+          see <http://github.com/hjdivad/git-topic>
+
           Commands are:
             #{SubCommands.join( "
             " )}
 
             Global Options:
         ".cleanup
+        version Version
 
         opt :verbose,   "Verbose output, including complete traces on errors."
-        stop_on     SubCommands
+        stop_on         SubCommands
       end
 
       cmd       = ARGV.shift
@@ -34,24 +45,31 @@ module GitTopic
         case cmd
         when "work-on"
           banner "
-            work-on <topic>
+            git work-on <topic>
+            git-topic work-on <topic>
 
             Switches to a local work-in-progress (wip) branch for <topic>.  The
             branch (and a matching remote branch) is created if necessary.
 
             If this is a rejected topic, work will continue from the state of
             the rejected topic branch.
+
+            Options:
           ".cleanup
         when /done(-with)?/
           banner "
-            done
+            git done
+            git-topic done
 
             Indicate that this topic branch is ready for review.  Push to a
             remote review branch and switch back to master.
+
+            Options:
           ".cleanup
         when "status"
           banner "
-            status
+            git st
+            git-topic status
 
             Print a status, showing rejected branches to work on and branches
             that can be reviewed.
@@ -66,28 +84,37 @@ module GitTopic
                 :default => false
         when "review"
           banner "
-            review [<topic>]
+            git review [<topic>]
+            git-topic reivew [<topic>]
 
             Review <topic>.  If <topic> is unspecified, review the oldest (by HEAD) topic.
+
+            Options:
           ".cleanup
         when "accept"
           banner "
-            accept
+            git accept
+            git-topic accept
 
             Accept the current in-review topic, merging it to master and
             cleaning up the remote branch.  This will fail if the branch does
             not merge as a fast-forward in master.  If that happens, the topic
             should either be rejected, or you can manually rebase.
+
+            Options:
           ".cleanup
         when "reject"
           banner "
-            reject
+            git reject
+            git-topic reject
 
             Reject the current in-review topic.
+
+            Options:
           ".cleanup
         when "install-aliases"
           banner "
-            install-aliases
+            git-topic install-aliases
 
             Install aliases to make git topic nicer to work with.  The aliases are as follows:
 

data/git-topic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-topic}
-  s.version = "0.1.5"
+  s.version = "0.1.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David J. Hamilton"]
-  s.date = %q{2010-07-13}
+  s.date = %q{2010-07-14}
   s.default_executable = %q{git-topic}
   s.description = %q{
       gem command around reviewed topic branches.  Supports workflow of the form:
@@ -53,7 +53,7 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.rdoc",
      "Rakefile",
-     "VERSION",
+     "VERSION.yml",
      "autotest/discover.rb",
      "bin/git-topic",
      "git-topic.gemspec",
@@ -112,7 +112,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
       s.add_runtime_dependency(%q<trollop>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
@@ -121,7 +121,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<gemcutter>, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
       s.add_dependency(%q<trollop>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
@@ -131,7 +131,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<gemcutter>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
     s.add_dependency(%q<trollop>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])

data/lib/git_topic.rb

@@ -13,8 +13,6 @@ module GitTopic
   include GitTopic::Git
   include GitTopic::Naming
 
-  GlobalOptKeys = [ :verbose, :help, :verbose_given ]
-
 
   class << self
 

metadata

@@ -5,8 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  - 2
+  version: 0.1.6.2
 platform: ruby
 authors: 
 - David J. Hamilton
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 -07:00
+date: 2010-07-14 00:00:00 -07:00
 default_executable: git-topic
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +26,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 0
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -147,7 +151,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
+- VERSION.yml
 - autotest/discover.rb
 - bin/git-topic
 - git-topic.gemspec

data/VERSION

@@ -1 +0,0 @@
-0.1.5