<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>features/autotag.feature</filename>
    </added>
    <added>
      <filename>features/step_definitions/autotag_steps.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,24 +1,38 @@
 #!/usr/bin/env ruby
 require File.expand_path(File.join(File.dirname(__FILE__), &quot;..&quot;, &quot;lib&quot;, &quot;auto_tagger&quot;))
+require 'getoptlong'
+
+opts = GetoptLong.new(
+  ['--help', '-h', '-?', GetoptLong::NO_ARGUMENT]
+)
 
 def usage
   puts
-  puts &quot;USAGE: #{File.basename($0)} [-h] [&lt;stage&gt; &lt;repository&gt;]&quot;
+  puts &quot;USAGE: #{File.basename($0)} &lt;stage&gt; [&lt;repository&gt;]&quot;
+  puts
+  puts '    where:    stage       sets the tag prefix'
+  puts '              repository  sets the repository to act on - defualts to the current directory'
   puts
-  puts '    where:  -h displays this help message'
-  puts '            stage sets the tag prefix'
-  puts '            repository sets the repository to act on'
+  puts '    examples: autotag'
+  puts '              autotag .'
+  puts '              autotag ../'
+  puts '              autotag /data/myrepo'
+  puts '              autotag demo'
   puts
-  puts '    example: autotag demo'
   puts
-  exit 1
+  exit 0
 end
 
-if ARGV[0] &amp;&amp; [&quot;-h&quot;, &quot;--help&quot;].include?(ARGV[0])
-  usage
-elsif ARGV[0]
+opts.each do |opt, arg|
+  case opt
+  when &quot;--help&quot;
+    usage
+  end
+end
+
+if ARGV[0]
   AutoTagger.new(ARGV[0], ARGV[1]).create_tag
-  exit 1
+  exit 0
 else
   usage
 end</diff>
      <filename>bin/autotag</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,3 @@
-# create keys between the users on this machine
 Feature: Deployment
   In order to get auto-tagging goodness
   As a ruby and git ninja</diff>
      <filename>features/deployment.feature</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,7 @@
 require 'spec'
 require 'erb'
 require 'etc'
+require 'activesupport'
 
 Before do
   StepHelpers.new.reset</diff>
      <filename>features/support/env.rb</filename>
    </modified>
    <modified>
      <diff>@@ -21,12 +21,20 @@ class StepHelpers
   def create_app_with_single_deploy_file
     create_git_repo
     create_app
+    capify_app
     create_single_deploy_file
   end
 
+  def run_autotag(args = nil)
+    cmd = &quot;cd #{app_dir} &amp;&amp; ../../bin/autotag&quot;
+    cmd += &quot; #{args}&quot; if args
+    `#{cmd}`
+  end
+
   def create_app_with_cap_ext_multistage
     create_git_repo
     create_app
+    capify_app
     create_cap_ext_multistage_deploy_files
   end
 
@@ -49,15 +57,11 @@ class StepHelpers
     tags
   end
 
-  private
-
   def create_app
     FileUtils.mkdir_p app_dir
     run_commands [
       &quot;cd #{app_dir}&quot;,
       &quot;touch README&quot;,
-      &quot;mkdir config&quot;,
-      &quot;capify .&quot;,
       &quot;git init&quot;,
       &quot;git add .&quot;,
       %Q{git commit -m &quot;first commit&quot;},
@@ -66,6 +70,16 @@ class StepHelpers
     ]
   end
 
+  private
+
+  def capify_app
+    run_commands [
+      &quot;cd #{app_dir}&quot;,
+      &quot;mkdir config&quot;,
+      &quot;capify .&quot;
+    ]
+  end
+
   def create_single_deploy_file
     repository = repo_dir
     deploy_to = File.join(test_files_dir, &quot;deployed&quot;)</diff>
      <filename>features/support/step_helpers.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3,3 +3,5 @@ gems:
   version: '&gt;= 2.5.3'
 - name: capistrano-ext
   version: '&gt;= 1.2.1'
+- name: activesupport
+  version: '&gt;= 2.3.2'
\ No newline at end of file</diff>
      <filename>geminstaller.yml</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>23087241c495773c8eece1c195cc453a8055c4eb</id>
    </parent>
  </parents>
  <author>
    <name>Jeff Dean</name>
    <email>jeff@zilkey.com</email>
  </author>
  <url>http://github.com/zilkey/auto_tagger/commit/44d653dd32a34ddc4689ed89271f133f3ea353c4</url>
  <id>44d653dd32a34ddc4689ed89271f133f3ea353c4</id>
  <committed-date>2009-04-05T15:24:55-07:00</committed-date>
  <authored-date>2009-04-05T15:24:55-07:00</authored-date>
  <message>Added cucumber coverage to some basic autotag usages.  Added GetOptLong to the autotag script, in preparation for getting custom commit messages to work.</message>
  <tree>6bbc006d022b4e642578804721a5ac88157da688</tree>
  <committer>
    <name>Jeff Dean</name>
    <email>jeff@zilkey.com</email>
  </committer>
</commit>
