auto_tagger 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+2010-09-16
+  - fixed bug where capistrano task set_branch would not set the proper branch
+  - fixed bug where capistratno task print_latest_tags would blow up (thanks to Ian Zabel for help in debugging)
+  - fixed bug where capistrano would not write the text file to the server if an explicit branch was not set
+  - fixed bug where passing -v to autotag would show the help, not the version
+
 2010-08-10
 
 - Added the following commands

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/auto_tagger.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{auto_tagger}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Dean", "Brian Takita", "Mike Grafton", "Bruce Krysiak", "Pat Nakajima", "Jay Zeschin", "Mike Barinek", "Sarah Mei"]
-  s.date = %q{2010-09-10}
+  s.date = %q{2010-09-16}
   s.default_executable = %q{autotag}
   s.email = %q{jeff@zilkey.com}
   s.executables = ["autotag"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "features/deployment.feature",
      "features/step_definitions/autotag_steps.rb",
      "features/step_definitions/deployment_steps.rb",
+     "features/step_definitions/shared_steps.rb",
      "features/support/env.rb",
      "features/support/step_helpers.rb",
      "features/templates/cap_ext_deploy.erb",

data/features/deployment.feature

@@ -16,6 +16,7 @@ Feature: Deployment
       |production  |
     When I deploy
     Then a "production" tag should be added to git
+    But I should not see "no branch available"
 
   @0.1.5
   Scenario: user deploys with single file deploy.rb stages with dashes in the name
@@ -31,3 +32,10 @@ Feature: Deployment
     And a ci tag
     When I deploy to staging
     Then a tag should be added to git
+
+  @0.1.5
+  Scenario: user sees latest tags
+    Given a three-stage app using cap-multistage
+    And a ci tag
+    When I deploy to staging
+    Then I should see "release tag history is:"

data/features/step_definitions/autotag_steps.rb

@@ -25,10 +25,6 @@ When /^I run autotag with "([^\"]*)"$/ do |args|
   end
 end
 
-Then /^I should see "([^\"]*)"$/ do |text|
-  @output.should =~ /#{Regexp.escape(text)}/
-end
-
 Then /^the exit code should be "(\d+)"$/ do |code|
   @exit_code.exitstatus.should == code.to_i
 end

data/features/step_definitions/deployment_steps.rb

@@ -9,7 +9,7 @@ end
 Given /^a one\-stage app using single deploy file with the following environments:$/ do |table|
   with_or_without_debugging do
     helpers = StepHelpers.new
-    helpers.create_app_with_single_deploy_file table.raw.map(&:first)
+    helpers.create_app_with_single_deploy_file table.raw.map{|item| item.first}
     @refs = helpers.refs
   end
 end
@@ -41,14 +41,14 @@ end
 When /^I deploy to (.*)$/ do |environment|
   with_or_without_debugging do
     helpers = StepHelpers.new
-    helpers.deploy(environment)
+    @output = helpers.deploy(environment)
   end
 end
 
 When /^I deploy$/ do
   with_or_without_debugging do
     helpers = StepHelpers.new
-    helpers.deploy
+    @output = helpers.deploy
   end
 end
 

data/features/step_definitions/shared_steps.rb

@@ -0,0 +1,8 @@
+Then /^I should see "([^\"]*)"$/ do |text|
+  @output.should =~ /#{Regexp.escape(text)}/
+end
+
+Then /^I should not see "([^\"]*)"$/ do |text|
+  @output.should_not =~ /#{Regexp.escape(text)}/
+end
+

data/features/support/step_helpers.rb

@@ -155,7 +155,9 @@ class StepHelpers
   end
 
   def run_commands(commands)
-    puts `#{commands.join(" && ")}`
+    output = `#{commands.join(" && ")} 2>&1`
+    puts output
+    output
   end
 
 end

data/lib/auto_tagger/configuration.rb

@@ -32,11 +32,12 @@ module AutoTagger
     def stages
       stages = settings[:stages] || []
       stages = stages.to_s.split(",").map { |stage| stage.strip } if stages.is_a?(String)
-      stages.reject { |stage| stage.to_s == "" }
+      stages.reject { |stage| stage.to_s == "" }.map {|stage| stage.to_s }
     end
 
     def stage
-      settings[:stage] || stages.last
+      stage = settings[:stage] || stages.last
+      stage.nil? ? nil : stage.to_s
     end
 
     def date_separator

data/lib/auto_tagger/git/ref_set.rb

@@ -13,6 +13,12 @@ module AutoTagger
         end
       end
 
+      def find_by_sha(sha)
+        all.detect do |ref|
+          ref.sha == sha
+        end
+      end
+
       # name = refs/autotags/2009857463
       # returns a ref
       # should un-cache the refs in refset, or never memoize

data/lib/auto_tagger/options.rb

@@ -58,10 +58,18 @@ module AutoTagger
         when "version"
           options[:show_version] = true
           options[:command] = :version
-        when * ["help", ""]
+        when "help"
           options[:show_help] = true
           options[:help_text] = args.options.help
           options[:command] = :help
+        when ""
+          if options[:show_version]
+            options[:command] = :version
+          else
+            options[:show_help] = true
+            options[:help_text] = args.options.help
+            options[:command] = :help
+          end
         when "cleanup"
           options[:command] = :cleanup
           options[:stage] = args[1]

data/lib/auto_tagger/recipes.rb

@@ -44,7 +44,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc %Q{DEPRECATED: Prints the most current tags from all stages}
     task :print_latest_refs, :roles => :app do
       log_auto_tagger "release tag history is:"
-      auto_tagger.release_tag_entries.each { |entry| logger.info entry }
+      auto_tagger.release_tag_entries.each { |entry| logger.info(entry.to_s) }
     end
 
     desc %Q{DEPRECATED: Reads the text file with the latest tag from the shared directory}
@@ -55,9 +55,17 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc %Q{DEPRECATED: Writes the tag name to a file in the shared directory}
     task :write_ref_to_shared, :roles => :app do
-      if exists?(:branch)
+      ref_name = if exists?(:branch)
+        branch
+      elsif ref = auto_tagger.repo.refs.find_by_sha(real_revision)
+        ref.name
+      else
+        nil
+      end
+
+      if ref_name
         log_auto_tagger "writing tag to shared text file on remote server"
-        run "echo '#{branch}' > #{shared_path}/released_git_tag.txt"
+        run "echo '#{ref_name}' > #{shared_path}/released_git_tag.txt"
       else
         log_auto_tagger "no branch available.  Text file was not written to server"
       end
@@ -75,9 +83,9 @@ Capistrano::Configuration.instance(:must_exist).load do
       auto_tagger.create_ref
     end
 
-    desc %Q{DEPRECATED: use auto_tagger:print_latest_tags}
-    task :print_latest_refs, :roles => :app do
-      auto_tagger.print_latest_tags
+    desc %Q{DEPRECATED: use auto_tagger:print_latest_refs}
+    task :print_latest_tags, :roles => :app do
+      auto_tagger.print_latest_refs
     end
 
     desc %Q{DEPRECATED: use auto_tagger:read_ref_from_shared}

data/spec/auto_tagger/configuration_spec.rb

@@ -91,6 +91,11 @@ describe AutoTagger::Configuration do
       config = AutoTagger::Configuration.new :stages => ["ci", ""]
       config.stages.should == ["ci"]
     end
+
+    it "turns stages into strings" do
+      config = AutoTagger::Configuration.new :stages => [:ci, :production]
+      config.stages.should == ["ci", "production"]
+    end
   end
 
   describe "#stage" do
@@ -108,6 +113,11 @@ describe AutoTagger::Configuration do
       config = AutoTagger::Configuration.new
       config.stage.should be_nil
     end
+
+    it "stringifies the passed in stage" do
+      config = AutoTagger::Configuration.new :stage => :demo
+      config.stage.should == "demo"
+    end
   end
 
   describe "#date_separator" do

data/spec/auto_tagger/git/ref_set_spec.rb

@@ -7,7 +7,7 @@ describe AutoTagger::Git::RefSet do
     @ref_set = AutoTagger::Git::RefSet.new(@repo)
     @refstring = <<-LIST
       23087241c495773c8eece1c195cc453a8055c4eb refs/tags/200808080808
-      23087241c495773c8eece1c195cc453a8055c4eb refs/tags/200808080809
+      23087241c495773b8eecr1c195cd453a8056c4eb refs/tags/200808080809
     LIST
   end
 
@@ -21,6 +21,19 @@ describe AutoTagger::Git::RefSet do
     end
   end
 
+  describe "#find_by_sha" do
+    it "returns a ref by the sha" do
+      @repo.should_receive(:read).with("show-ref").and_return(@refstring)
+      ref = @ref_set.find_by_sha("23087241c495773b8eecr1c195cd453a8056c4eb")
+      ref.name.should == "refs/tags/200808080809"
+    end
+
+    it "returns nil if it's not found" do
+      @repo.should_receive(:read).with("show-ref").and_return(@refstring)
+      @ref_set.find_by_sha("abc123").should be_nil
+    end
+  end
+
   describe "#create" do
     it "instantiates and saves a ref" do
       @repo.should_receive(:exec).with("update-ref refs/auto_tags/demo/2008 abc123")

data/spec/auto_tagger/options_spec.rb

@@ -124,6 +124,9 @@ describe AutoTagger::Options do
       options = AutoTagger::Options.from_command_line ["version"]
       options[:command].should == :version
 
+      options = AutoTagger::Options.from_command_line ["-v"]
+      options[:command].should == :version
+
       options = AutoTagger::Options.from_command_line ["help"]
       options[:command].should == :help
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: auto_tagger
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jeff Dean
@@ -22,7 +22,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 -04:00
+date: 2010-09-16 00:00:00 -04:00
 default_executable: autotag
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,7 @@ files:
 - features/deployment.feature
 - features/step_definitions/autotag_steps.rb
 - features/step_definitions/deployment_steps.rb
+- features/step_definitions/shared_steps.rb
 - features/support/env.rb
 - features/support/step_helpers.rb
 - features/templates/cap_ext_deploy.erb