auto_tagger 0.1.0 → 0.1.2

data/.document

@@ -0,0 +1,6 @@
+README.md
+CHANGELOG
+MIT-LICENSE
+bin/*
+lib/**/*
+recipes/**/*

data/CHANGELOG

@@ -1,3 +1,9 @@
+2010-04-25
+
+- Fixed creating incorrect tags when deploying from a branch, tag, or from head (Brian Takita & Bruce Krysiak)
+- Namespaced all classes under AutoTagger (Pat Nakajima)
+- Renamed Commander.execute! to Commander.execute? (Pat Nakjima)
+
 2009-10-15
 
 - You can now define your stages as strings or symbols and auto-tagger will not fail (thanks to Chad Wooley for the bug report)

data/README.md

@@ -1,6 +1,6 @@
 # IMPORTANT NOTE
 
-This gem is still in it's infancy, and lots of things might change.  Since this creates and pushes tags to your git repository, please use with caution.
+This creates and pushes tags to your git repository, please use with caution.
 
 # AutoTagger
 
@@ -16,12 +16,10 @@ You can use the `autotag` command to tag releases on your CI box, then use the c
 
 ## Installation
 
-    gem sources -a http://gems.github.com
-    sudo gem install zilkey-auto_tagger
+    sudo gem install auto_tagger
 
 ## Contribute
 
-  * [Tracker Project](http://www.pivotaltracker.com/projects/11988)
   * [GitHub Repository](http://github.com/zilkey/auto_tagger/tree/master)
 
 ## The autotag executable
@@ -164,12 +162,13 @@ To run the cucumber features, execute:
 
 ## Acknowledgments
 
-Special thanks to 
+Special thanks to:
 
  * Brian Takita for the original recipes
  * Mike Dalessio for his git fu
  * Chad Wooley for his feature ideas
  * Tim Holahan for his QA
+ * Pat Nakajima for making auto_tagger a better ruby citizen
 
 ## Links
 

data/Rakefile

@@ -0,0 +1,46 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "auto_tagger"
+    gem.summary = %Q{Helps you automatically create tags for each stage in a multi-stage deploment and deploy from the latest tag from the previous environment}
+    gem.email = "jeff@zilkey.com"
+    gem.homepage = "http://github.com/zilkey/auto_tagger"
+    gem.authors = ["Jeff Dean", "Brian Takita", "Mike Grafton", "Bruce Krysiak", "Pat Nakajima", "Jay Zeschin", "Mike Barinek"]
+    gem.add_dependency('capistrano', [">= 2.5.3"])
+    gem.require_paths = ["lib"]
+    gem.executables = ["autotag"]
+    gem.default_executable = %q{autotag}
+    gem.date = %q{2010-04-25}
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "the-perfect-gem #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/auto_tagger.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{auto_tagger}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jeff Dean", "Brian Takita"]
-  s.date = %q{2009-10-15}
+  s.authors = ["Jeff Dean", "Brian Takita", "Mike Grafton", "Bruce Krysiak", "Pat Nakajima", "Jay Zeschin", "Mike Barinek"]
+  s.date = %q{2010-04-25}
   s.default_executable = %q{autotag}
   s.email = %q{jeff@zilkey.com}
   s.executables = ["autotag"]
@@ -17,10 +17,12 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
-    ".gitignore",
+    ".document",
+     ".gitignore",
      "CHANGELOG",
      "MIT-LICENSE",
      "README.md",
+     "Rakefile",
      "VERSION",
      "auto_tagger.gemspec",
      "bin/autotag",
@@ -35,14 +37,14 @@ Gem::Specification.new do |s|
      "features/templates/stage.erb",
      "geminstaller.yml",
      "lib/auto_tagger.rb",
-     "lib/auto_tagger/auto_tagger.rb",
+     "lib/auto_tagger/base.rb",
      "lib/auto_tagger/capistrano_helper.rb",
      "lib/auto_tagger/commander.rb",
+     "lib/auto_tagger/recipes.rb",
      "lib/auto_tagger/repository.rb",
      "lib/auto_tagger/stage_manager.rb",
      "lib/auto_tagger/tag.rb",
-     "recipes/release_tagger.rb",
-     "spec/auto_tagger/auto_tagger_spec.rb",
+     "spec/auto_tagger/base_spec.rb",
      "spec/auto_tagger/capistrano_helper_spec.rb",
      "spec/auto_tagger/commander_spec.rb",
      "spec/auto_tagger/repository_spec.rb",
@@ -52,11 +54,11 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/zilkey/auto_tagger}
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib", "recipes"]
-  s.rubygems_version = %q{1.3.5}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Helps you automatically create tags for each stage in a multi-stage deploment and deploy from the latest tag from the previous environment}
   s.test_files = [
-    "spec/auto_tagger/auto_tagger_spec.rb",
+    "spec/auto_tagger/base_spec.rb",
      "spec/auto_tagger/capistrano_helper_spec.rb",
      "spec/auto_tagger/commander_spec.rb",
      "spec/auto_tagger/repository_spec.rb",
@@ -78,3 +80,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<capistrano>, [">= 2.5.3"])
   end
 end
+

data/bin/autotag

@@ -2,10 +2,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "auto_tagger"))
 require 'getoptlong'
 
-opts = GetoptLong.new(
-  ['--help', '-h', '-?', GetoptLong::NO_ARGUMENT]
-)
-
 def usage
   puts
   puts "USAGE: #{File.basename($0)} <stage> [<repository>]"
@@ -23,16 +19,11 @@ def usage
   exit 0
 end
 
-opts.each do |opt, arg|
-  case opt
-  when "--help"
-    usage
-  end
-end
-
-if ARGV[0]
-  AutoTagger.new(ARGV[0], ARGV[1]).create_tag
-  exit 0
+if ARGV[0] && ["-h", "--help", "-?", "--?"].include?(ARGV[0])
+  usage
+elsif ARGV[0]
+  AutoTagger::Runner.new(ARGV[0], ARGV[1]).create_tag
+  exit 1
 else
   usage
 end

data/features/support/step_helpers.rb

@@ -1,5 +1,4 @@
 class StepHelpers
-
   attr_reader :test_files_dir, :app_dir, :repo_dir
 
   def initialize

data/features/templates/cap_ext_deploy.erb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "recipes", "release_tagger"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "auto_tagger", "recipes"))
 
 set :autotagger_stages, [:ci, :staging, :production]
 set :stages, [:staging, :production]

data/features/templates/deploy.erb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "recipes", "release_tagger"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "auto_tagger", "recipes"))
 
 set :autotagger_stages, ["<%= environments.join('", "') %>"]
 

data/lib/auto_tagger/base.rb

@@ -0,0 +1,26 @@
+module AutoTagger
+  class EnvironmentCannotBeBlankError < StandardError; end
+  
+  class Runner
+    attr_reader :stage, :repository, :working_directory
+
+    def initialize(stage, path = nil)
+      raise EnvironmentCannotBeBlankError if stage.to_s.strip == ""
+      @working_directory = File.expand_path(path ||= Dir.pwd)
+      @repository = Repository.new(@working_directory)
+      @stage = stage
+    end
+
+    def create_tag(commit = nil)
+      repository.tags.fetch
+      new_tag = repository.tags.create(stage, commit)
+      repository.tags.push
+      new_tag
+    end
+
+    def latest_tag
+      repository.tags.fetch
+      repository.tags.latest_from(stage)
+    end
+  end
+end

data/lib/auto_tagger/capistrano_helper.rb

@@ -1,39 +1,41 @@
-class CapistranoHelper
+module AutoTagger
+  class CapistranoHelper
 
-  attr_reader :variables, :stage, :working_directory
+    attr_reader :variables, :stage, :working_directory
 
-  def initialize(variables)
-    @stage_manager = StageManager.new(variables[:autotagger_stages])
-    @variables = variables
-    @stage = variables[:stage]
-    @working_directory = variables[:working_directory] || Dir.pwd
-  end
+    def initialize(variables)
+      @stage_manager = StageManager.new(variables[:autotagger_stages])
+      @variables = variables
+      @stage = variables[:stage]
+      @working_directory = variables[:working_directory] || Dir.pwd
+    end
 
-  def previous_stage
-    @stage_manager.previous_stage(stage)
-  end
+    def previous_stage
+      @stage_manager.previous_stage(stage)
+    end
 
-  def branch
-    if variables.has_key?(:head)
-      variables[:branch]
-    elsif variables.has_key?(:tag)
-      variables[:tag]
-    elsif previous_stage && (latest = AutoTagger.new(previous_stage, working_directory).latest_tag)
-      latest
-    else
-      variables[:branch]
+    def branch
+      if variables.has_key?(:head)
+        variables[:branch]
+      elsif variables.has_key?(:tag)
+        variables[:tag]
+      elsif previous_stage && (latest = Runner.new(previous_stage, working_directory).latest_tag)
+        latest
+      else
+        variables[:branch]
+      end
     end
-  end
 
-  def release_tag_entries
-    entries = []
-    @stage_manager.stages.each do |stage|
-      tagger = AutoTagger.new(stage, working_directory)
-      tag = tagger.latest_tag
-      commit = tagger.repository.commit_for(tag)
-      entries << "#{stage.to_s.ljust(10, " ")} #{tag.to_s.ljust(30, " ")} #{commit.to_s}"
+    def release_tag_entries
+      entries = []
+      @stage_manager.stages.each do |stage|
+        tagger = Runner.new(stage, working_directory)
+        tag = tagger.latest_tag
+        commit = tagger.repository.commit_for(tag)
+        entries << "#{stage.to_s.ljust(10, " ")} #{tag.to_s.ljust(30, " ")} #{commit.to_s}"
+      end
+      entries
     end
-    entries
-  end
 
-end
+  end
+end

data/lib/auto_tagger/commander.rb

@@ -1,15 +1,19 @@
-class Commander
-  class << self
-    def execute(path, cmd)
-      `#{command_in_context(path, cmd)}`
-    end
+module AutoTagger
+  class Commander
+    class << self
+      def execute(path, cmd)
+        `#{command_in_context(path, cmd)}`
+      end
 
-    def execute!(path, cmd)
-      system command_in_context(path, cmd)
-    end
+      def execute?(path, cmd)
+        system command_in_context(path, cmd)
+      end
+
+      private
 
-    def command_in_context(path, cmd)
-      "cd #{path} && #{cmd}"
+      def command_in_context(path, cmd)
+        "cd #{path} && #{cmd}"
+      end
     end
   end
 end

data/{recipes/release_tagger.rb → lib/auto_tagger/recipes.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "auto_tagger"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "auto_tagger"))
 
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :release_tagger do
@@ -7,7 +7,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       Use -Shead=true to set the branch to master, -Stag=<tag> to specify the tag explicitly.
     }
     task :set_branch do
-      if branch_name = CapistranoHelper.new(variables).branch
+      if branch_name = AutoTagger::CapistranoHelper.new(variables).branch
         set :branch, branch_name
         logger.info "setting branch to #{branch_name}"
       else
@@ -18,7 +18,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc %Q{Prints the most current tags from all stages}
     task :print_latest_tags, :roles => :app do
       logger.info "AUTO TAGGER: release tag history is:"
-      entries = CapistranoHelper.new(variables).release_tag_entries
+      entries = AutoTagger::CapistranoHelper.new(variables).release_tag_entries
       entries.each do |entry|
         logger.info entry
       end
@@ -43,10 +43,10 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc %Q{Creates a tag using the stage variable}
     task :create_tag, :roles => :app do
       if variables[:stage]
-        tag_name = AutoTagger.new(variables[:stage], variables[:working_directory]).create_tag(real_revision)
+        tag_name = AutoTagger::Runner.new(variables[:stage], variables[:working_directory]).create_tag(real_revision)
         logger.info "AUTO TAGGER created tag #{tag_name} from #{real_revision}"
       else
-        tag_name = AutoTagger.new(:production, variables[:working_directory]).create_tag
+        tag_name = AutoTagger::Runner.new(:production, variables[:working_directory]).create_tag
         logger.info "AUTO TAGGER created tag #{tag_name}"
       end
     end

data/lib/auto_tagger/repository.rb

@@ -1,42 +1,43 @@
-class Repository
-
+module AutoTagger
   class NoPathProvidedError < StandardError; end
   class NoSuchPathError < StandardError; end
   class InvalidGitRepositoryError < StandardError; end
   class GitCommandFailedError < StandardError; end
+  
+  class Repository
+    attr_reader :path
+
+    def initialize(path)
+      if path.to_s.strip == ""
+        raise NoPathProvidedError
+      elsif ! File.exists?(path)
+        raise NoSuchPathError
+      elsif ! File.exists?(File.join(path, ".git"))
+        raise InvalidGitRepositoryError
+      else
+        @path = path
+      end
+    end
 
-  attr_reader :path
-
-  def initialize(path)
-    if path.to_s.strip == ""
-      raise NoPathProvidedError
-    elsif ! File.exists?(path)
-      raise NoSuchPathError
-    elsif ! File.exists?(File.join(path, ".git"))
-      raise InvalidGitRepositoryError
-    else
-      @path = path
+    def ==(other)
+      other.is_a?(Repository) && other.path == path
     end
-  end
 
-  def ==(other)
-    other.is_a?(Repository) && other.path == path
-  end
+    def tags
+      @tags ||= Tag.new(self)
+    end
 
-  def tags
-    @tags ||= Tag.new(self)
-  end
+    def commit_for(tag)
+      Commander.execute(path, "git --no-pager log #{tag} --pretty=oneline -1")
+    end
 
-  def commit_for(tag)
-    Commander.execute(path, "git --no-pager log #{tag} --pretty=oneline -1")
-  end
+    def run(cmd)
+      Commander.execute(path, cmd)
+    end
 
-  def run(cmd)
-    Commander.execute(path, cmd)
-  end
+    def run!(cmd)
+      Commander.execute?(path, cmd) || raise(GitCommandFailedError)
+    end
 
-  def run!(cmd)
-    Commander.execute!(path, cmd) || raise(GitCommandFailedError)
   end
-
-end
+end

data/lib/auto_tagger/stage_manager.rb

@@ -1,23 +1,23 @@
-class StageManager
-
-  class NoStagesSpecifiedError < StandardError
-    def message
-      "You must set the :stages variable to an array, like set :stages, [:ci, :demo]"
+module AutoTagger
+  class StageManager
+    class NoStagesSpecifiedError < StandardError
+      def message
+        "You must set the :stages variable to an array, like set :stages, [:ci, :demo]"
+      end
     end
-  end
 
-  attr_reader :stages
+    attr_reader :stages
 
-  def initialize(stages)
-    raise NoStagesSpecifiedError unless stages && stages.is_a?(Array)
-    @stages = stages.map{|stage| stage.to_s }
-  end
+    def initialize(stages)
+      raise NoStagesSpecifiedError unless stages && stages.is_a?(Array)
+      @stages = stages.map{|stage| stage.to_s }
+    end
 
-  def previous_stage(stage)
-    if stage
-      index = stages.index(stage.to_s) - 1
-      stages[index] if index > -1
+    def previous_stage(stage)
+      if stage
+        index = stages.index(stage.to_s) - 1
+        stages[index] if index > -1
+      end
     end
   end
-
-end
+end

data/lib/auto_tagger/tag.rb

@@ -1,41 +1,43 @@
 # git --no-pager log --pretty=oneline -1
 # git tag -a -m 'Successful continuous integration build on #{timestamp}' #{tag_name}"
-class Tag
+module AutoTagger
+  class Tag
 
-  attr_reader :repository
+    attr_reader :repository
 
-  def initialize(repository)
-    @repository = repository
-  end
+    def initialize(repository)
+      @repository = repository
+    end
 
-  def find_all
-    repository.run("git tag").split("\n")
-  end
+    def find_all
+      repository.run("git tag").split("\n")
+    end
 
-  def fetch
-    repository.run! "git fetch origin --tags"
-  end
+    def fetch
+      repository.run! "git fetch origin --tags"
+    end
 
-  def latest_from(stage)
-    find_all.select{|tag| tag =~ /^#{stage}\//}.sort.last
-  end
+    def latest_from(stage)
+      find_all.select{|tag| tag =~ /^#{stage}\//}.sort.last
+    end
 
-  def push
-    repository.run! "git push origin --tags"
-  end
+    def push
+      repository.run! "git push origin --tags"
+    end
 
-  def create(stage, commit = nil)
-    tag_name = name_for(stage)
-    cmd = "git tag #{tag_name}"
-    cmd += " #{commit}" if commit
-    repository.run! cmd
-    tag_name
-  end
+    def create(stage, commit = nil)
+      tag_name = name_for(stage)
+      cmd = "git tag #{tag_name}"
+      cmd += " #{commit}" if commit
+      repository.run! cmd
+      tag_name
+    end
 
-  private
+    private
 
-  def name_for(stage)
-    "%s/%s" % [stage, Time.now.utc.strftime('%Y%m%d%H%M%S')]
-  end
+    def name_for(stage)
+      "%s/%s" % [stage, Time.now.utc.strftime('%Y%m%d%H%M%S')]
+    end
 
-end
+  end
+end

data/lib/auto_tagger.rb

@@ -2,7 +2,7 @@
   'commander',
   'repository',
   'tag',
-  'auto_tagger',
+  'base',
   'stage_manager',
   'capistrano_helper'
 ].each do |file|

data/spec/auto_tagger/base_spec.rb

@@ -0,0 +1,85 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe AutoTagger::Runner do
+  before(:each) do
+    stub(Dir).pwd { File.join(File.dirname(__FILE__), '..', '..') }
+  end
+
+  describe ".new" do
+    it "blows up if you don't pass an stage" do
+      proc do
+        AutoTagger::Runner.new(nil)
+      end.should raise_error(AutoTagger::EnvironmentCannotBeBlankError)
+    end
+
+    it "sets the stage when it's passed" do
+      AutoTagger::Runner.new("ci").stage.should == "ci"
+    end
+
+    it "sets the path to Dir.pwd when nil" do
+      mock(Dir).pwd { "/foo" }
+      mock(AutoTagger::Repository).new("/foo")
+      AutoTagger::Runner.new("ci")
+    end
+
+    it "expands the path when the path is passed" do
+      mock(AutoTagger::Repository).new(File.expand_path("."))
+      AutoTagger::Runner.new("ci", ".")
+    end
+
+    it "exposes the working directory" do
+      mock(AutoTagger::Repository).new(File.expand_path("."))
+      AutoTagger::Runner.new("ci", ".").working_directory.should == File.expand_path(".")
+    end
+  end
+
+  describe "#create_tag" do
+    it "generates the correct commands" do
+      time = Time.local(2001,1,1)
+      mock(Time).now.once {time}
+      timestamp = time.utc.strftime('%Y%m%d%H%M%S')
+      mock(File).exists?(anything).twice { true }
+
+      mock(AutoTagger::Commander).execute?("/foo", "git fetch origin --tags") {true}
+      mock(AutoTagger::Commander).execute?("/foo", "git tag ci/#{timestamp}") {true}
+      mock(AutoTagger::Commander).execute?("/foo", "git push origin --tags")  {true}
+
+      AutoTagger::Runner.new("ci", "/foo").create_tag
+    end
+
+    it "allows you to base it off an existing tag or commit" do
+      time = Time.local(2001,1,1)
+      mock(Time).now.once {time}
+      timestamp = time.utc.strftime('%Y%m%d%H%M%S')
+      mock(File).exists?(anything).twice { true }
+
+      mock(AutoTagger::Commander).execute?("/foo", "git fetch origin --tags") {true}
+      mock(AutoTagger::Commander).execute?("/foo", "git tag ci/#{timestamp} guid") {true}
+      mock(AutoTagger::Commander).execute?("/foo", "git push origin --tags")  {true}
+
+      AutoTagger::Runner.new("ci", "/foo").create_tag("guid")
+    end
+
+    it "returns the tag that was created" do
+      time = Time.local(2001,1,1)
+      mock(Time).now.once {time}
+      timestamp = time.utc.strftime('%Y%m%d%H%M%S')
+      mock(File).exists?(anything).twice { true }
+      mock(AutoTagger::Commander).execute?(anything, anything).times(any_times) {true}
+
+      AutoTagger::Runner.new("ci", "/foo").create_tag.should == "ci/#{timestamp}"
+    end
+  end
+
+  describe "#latest_tag" do
+    it "generates the correct commands" do
+      mock(File).exists?(anything).twice { true }
+
+      mock(AutoTagger::Commander).execute?("/foo", "git fetch origin --tags") {true}
+      mock(AutoTagger::Commander).execute("/foo", "git tag") { "ci_01" }
+
+      AutoTagger::Runner.new("ci", "/foo").latest_tag
+    end
+  end
+
+end

data/spec/auto_tagger/capistrano_helper_spec.rb

@@ -1,53 +1,53 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe CapistranoHelper do
+describe AutoTagger::CapistranoHelper do
 
   describe ".new" do
     it "blows up if there are no stages" do
       proc do
-        CapistranoHelper.new({})
-      end.should raise_error(StageManager::NoStagesSpecifiedError)
+        AutoTagger::CapistranoHelper.new({})
+      end.should raise_error(AutoTagger::StageManager::NoStagesSpecifiedError)
     end
   end
 
   describe "#variables" do
     it "returns all variables" do
-      CapistranoHelper.new({:autotagger_stages => [:bar]}).variables.should == {:autotagger_stages => [:bar]}
+      AutoTagger::CapistranoHelper.new({:autotagger_stages => [:bar]}).variables.should == {:autotagger_stages => [:bar]}
     end
   end
 
   describe "#working_directory" do
     it "returns the hashes' working directory value" do
-      CapistranoHelper.new({:autotagger_stages => [:bar], :working_directory => "/foo"}).working_directory.should == "/foo"
+      AutoTagger::CapistranoHelper.new({:autotagger_stages => [:bar], :working_directory => "/foo"}).working_directory.should == "/foo"
     end
 
     it "defaults to Dir.pwd if it's not set, or it's nil" do
       mock(Dir).pwd { "/bar" }
-      CapistranoHelper.new({:autotagger_stages => [:bar]}).working_directory.should == "/bar"
+      AutoTagger::CapistranoHelper.new({:autotagger_stages => [:bar]}).working_directory.should == "/bar"
     end
   end
 
   describe "#stage" do
     it "returns the hashes' current stage value" do
-      CapistranoHelper.new({:autotagger_stages => [:bar], :stage => :bar}).stage.should == :bar
-      CapistranoHelper.new({:autotagger_stages => [:bar]}).stage.should be_nil
+      AutoTagger::CapistranoHelper.new({:autotagger_stages => [:bar], :stage => :bar}).stage.should == :bar
+      AutoTagger::CapistranoHelper.new({:autotagger_stages => [:bar]}).stage.should be_nil
     end
   end
 
   describe "#release_tag_entries" do
     it "returns a column-justifed version of all the commits" do
-      mock(Commander).execute("/foo", "git tag").times(any_times) { "ci/01\nstaging/01\nproduction/01" }
-      mock(Commander).execute("/foo", "git --no-pager log ci/01 --pretty=oneline -1") { "guid1" }
-      mock(Commander).execute("/foo", "git --no-pager log staging/01 --pretty=oneline -1") { "guid2" }
-      mock(Commander).execute("/foo", "git --no-pager log production/01 --pretty=oneline -1") { "guid3" }
-      mock(Commander).execute!("/foo", "git fetch origin --tags").times(any_times) { true }
+      mock(AutoTagger::Commander).execute("/foo", "git tag").times(any_times) { "ci/01\nstaging/01\nproduction/01" }
+      mock(AutoTagger::Commander).execute("/foo", "git --no-pager log ci/01 --pretty=oneline -1") { "guid1" }
+      mock(AutoTagger::Commander).execute("/foo", "git --no-pager log staging/01 --pretty=oneline -1") { "guid2" }
+      mock(AutoTagger::Commander).execute("/foo", "git --no-pager log production/01 --pretty=oneline -1") { "guid3" }
+      mock(AutoTagger::Commander).execute?("/foo", "git fetch origin --tags").times(any_times) { true }
       mock(File).exists?(anything).times(any_times) {true}
 
       variables = {
         :working_directory => "/foo",
         :autotagger_stages => [:ci, :staging, :production]
       }
-      histories = CapistranoHelper.new(variables).release_tag_entries
+      histories = AutoTagger::CapistranoHelper.new(variables).release_tag_entries
       histories.length.should == 3
       histories[0].should include("ci/01", "guid1")
       histories[1].should include("staging/01", "guid2")
@@ -55,16 +55,16 @@ describe CapistranoHelper do
     end
 
     it "ignores tags delimited with '_'" do
-      mock(Commander).execute("/foo", "git tag").times(any_times) { "ci/01\nci_02" }
-      mock(Commander).execute("/foo", "git --no-pager log ci/01 --pretty=oneline -1") { "guid1" }
-      mock(Commander).execute!("/foo", "git fetch origin --tags").times(any_times) { true }
+      mock(AutoTagger::Commander).execute("/foo", "git tag").times(any_times) { "ci/01\nci_02" }
+      mock(AutoTagger::Commander).execute("/foo", "git --no-pager log ci/01 --pretty=oneline -1") { "guid1" }
+      mock(AutoTagger::Commander).execute?("/foo", "git fetch origin --tags").times(any_times) { true }
       mock(File).exists?(anything).times(any_times) {true}
 
       variables = {
         :working_directory => "/foo",
         :autotagger_stages => [:ci]
       }
-      histories = CapistranoHelper.new(variables).release_tag_entries
+      histories = AutoTagger::CapistranoHelper.new(variables).release_tag_entries
       histories.length.should == 1
       histories[0].should include("ci/01", "guid1")
     end
@@ -78,7 +78,7 @@ describe CapistranoHelper do
           :head => nil,
           :branch => "foo"
         }
-        CapistranoHelper.new(variables).branch.should == "foo"
+        AutoTagger::CapistranoHelper.new(variables).branch.should == "foo"
       end
     end
 
@@ -88,7 +88,7 @@ describe CapistranoHelper do
           :autotagger_stages => [:bar],
           :head => nil
         }
-        CapistranoHelper.new(variables).branch.should == nil
+        AutoTagger::CapistranoHelper.new(variables).branch.should == nil
       end
     end
 
@@ -98,7 +98,7 @@ describe CapistranoHelper do
           :autotagger_stages => [:bar],
           :branch => "foo"
         }
-        CapistranoHelper.new(variables).branch.should == "foo"
+        AutoTagger::CapistranoHelper.new(variables).branch.should == "foo"
       end
     end
 
@@ -112,8 +112,8 @@ describe CapistranoHelper do
         }
         tagger = Object.new
         mock(tagger).latest_tag { "foo_01" }
-        mock(AutoTagger).new("foo", "/foo") { tagger }
-        CapistranoHelper.new(variables).branch.should == "foo_01"
+        mock(AutoTagger::Runner).new("foo", "/foo") { tagger }
+        AutoTagger::CapistranoHelper.new(variables).branch.should == "foo_01"
       end
     end
 
@@ -126,8 +126,8 @@ describe CapistranoHelper do
         }
         tagger = Object.new
         mock(tagger).latest_tag { nil }
-        mock(AutoTagger).new("foo", "/foo") { tagger }
-        CapistranoHelper.new(variables).branch.should == nil
+        mock(AutoTagger::Runner).new("foo", "/foo") { tagger }
+        AutoTagger::CapistranoHelper.new(variables).branch.should == nil
       end
     end
 
@@ -137,8 +137,8 @@ describe CapistranoHelper do
           :autotagger_stages => [:bar],
           :stage => :bar
         }
-        CapistranoHelper.new(variables).previous_stage.should be_nil
-        CapistranoHelper.new(variables).branch.should == nil
+        AutoTagger::CapistranoHelper.new(variables).previous_stage.should be_nil
+        AutoTagger::CapistranoHelper.new(variables).branch.should == nil
       end
     end
   end

data/spec/auto_tagger/commander_spec.rb

@@ -1,17 +1,17 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe Commander do
+describe AutoTagger::Commander do
   describe ".execute" do
     it "execute the command and returns the results" do
-      mock(Commander).`("cd /foo && ls") { "" } #`
-      Commander.execute("/foo", "ls")
+      mock(AutoTagger::Commander).`("cd /foo && ls") { "" } #`
+      AutoTagger::Commander.execute("/foo", "ls")
     end
   end
 
   describe "system" do
     it "executes and doesn't return anything" do
-      mock(Commander).system("cd /foo && ls")
-      Commander.execute!("/foo", "ls")
+      mock(AutoTagger::Commander).system("cd /foo && ls")
+      AutoTagger::Commander.execute?("/foo", "ls")
     end
   end
 end

data/spec/auto_tagger/repository_spec.rb

@@ -1,71 +1,71 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe Repository do
+describe AutoTagger::Repository do
   describe ".new" do
     it "sets the repo" do
       mock(File).exists?(anything).twice { true }
-      repo = Repository.new("/foo")
+      repo = AutoTagger::Repository.new("/foo")
       repo.path.should == "/foo"
     end
 
     it "raises an error when the path is blank" do
       proc do
-        Repository.new(" ")
-      end.should raise_error(Repository::NoPathProvidedError)
+        AutoTagger::Repository.new(" ")
+      end.should raise_error(AutoTagger::NoPathProvidedError)
     end
 
     it "raises an error when the path is nil" do
       proc do
-        Repository.new(nil)
-      end.should raise_error(Repository::NoPathProvidedError)
+        AutoTagger::Repository.new(nil)
+      end.should raise_error(AutoTagger::NoPathProvidedError)
     end
 
     it "raises an error with a file that doesn't exist" do
       mock(File).exists?("/foo") { false }
       proc do
-        Repository.new("/foo")
-      end.should raise_error(Repository::NoSuchPathError)
+        AutoTagger::Repository.new("/foo")
+      end.should raise_error(AutoTagger::NoSuchPathError)
     end
 
     it "raises an error with a non-git repository" do
       mock(File).exists?("/foo") { true }
       mock(File).exists?("/foo/.git") { false }
       proc do
-        Repository.new("/foo")
-      end.should raise_error(Repository::InvalidGitRepositoryError)
+        AutoTagger::Repository.new("/foo")
+      end.should raise_error(AutoTagger::InvalidGitRepositoryError)
     end
   end
 
   describe "#==" do
     it "compares paths" do
       mock(File).exists?(anything).times(any_times) { true }
-      Repository.new("/foo").should_not == "/foo"
-      Repository.new("/foo").should_not == Repository.new("/bar")
-      Repository.new("/foo").should == Repository.new("/foo")
+      AutoTagger::Repository.new("/foo").should_not == "/foo"
+      AutoTagger::Repository.new("/foo").should_not == AutoTagger::Repository.new("/bar")
+      AutoTagger::Repository.new("/foo").should == AutoTagger::Repository.new("/foo")
     end
   end
 
   describe "#run" do
     it "sends the correct command" do
       mock(File).exists?(anything).twice { true }
-      mock(Commander).execute("/foo", "bar")
-      Repository.new("/foo").run("bar")
+      mock(AutoTagger::Commander).execute("/foo", "bar")
+      AutoTagger::Repository.new("/foo").run("bar")
     end
   end
 
   describe "run!" do
     it "sends the correct command" do
       mock(File).exists?(anything).twice { true }
-      mock(Commander).execute!("/foo", "bar") { true }
-      Repository.new("/foo").run!("bar")
+      mock(AutoTagger::Commander).execute?("/foo", "bar") { true }
+      AutoTagger::Repository.new("/foo").run!("bar")
     end
 
     it "raises an exception if it the command returns false" do
       mock(File).exists?(anything).twice { true }
-      mock(Commander).execute!("/foo", "bar") { false }
+      mock(AutoTagger::Commander).execute?("/foo", "bar") { false }
       proc do
-        Repository.new("/foo").run!("bar")
-      end.should raise_error(Repository::GitCommandFailedError)
+        AutoTagger::Repository.new("/foo").run!("bar")
+      end.should raise_error(AutoTagger::GitCommandFailedError)
     end
   end
 

data/spec/auto_tagger/stage_manager_spec.rb

@@ -1,32 +1,32 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe StageManager do
+describe AutoTagger::StageManager do
 
   describe ".new" do
     [nil, ""].each do |value|
       it "blows up if there are stages == #{value.inspect}" do
         proc do
-          StageManager.new(value)
-        end.should raise_error(StageManager::NoStagesSpecifiedError)
+          AutoTagger::StageManager.new(value)
+        end.should raise_error(AutoTagger::StageManager::NoStagesSpecifiedError)
       end
     end
   end
 
   describe "#previous_stage" do
     it "returns the previous stage as a string if there is more than one stage, and there is a current stage" do
-      StageManager.new([:foo, :bar]).previous_stage(:bar).should == "foo"
+      AutoTagger::StageManager.new([:foo, :bar]).previous_stage(:bar).should == "foo"
     end
 
     it "returns nil if there is no previous stage" do
-      StageManager.new([:bar]).previous_stage(:bar).should be_nil
+      AutoTagger::StageManager.new([:bar]).previous_stage(:bar).should be_nil
     end
 
     it "deals with mixed strings and symbols" do
-      StageManager.new([:"foo-bar", "baz"]).previous_stage(:baz).should == "foo-bar"
+      AutoTagger::StageManager.new([:"foo-bar", "baz"]).previous_stage(:baz).should == "foo-bar"
     end
 
     it "returns nil if there is no current stage" do
-      StageManager.new([:bar]).previous_stage(nil).should be_nil
+      AutoTagger::StageManager.new([:bar]).previous_stage(nil).should be_nil
     end
   end
 

data/spec/auto_tagger/tag_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe Tag do
+describe AutoTagger::Tag do
 
   before(:each) do
     @repository = Object.new
@@ -8,25 +8,25 @@ describe Tag do
 
   describe ".new" do
     it "sets the repository" do
-      Tag.new(@repository).repository.should == @repository
+      AutoTagger::Tag.new(@repository).repository.should == @repository
     end
   end
 
   describe "#find_all" do
     it "returns an array of tags" do
       mock(@repository).run("git tag") { "ci_01\nci_02" }
-      Tag.new(@repository).find_all.should == ["ci_01", "ci_02"]
+      AutoTagger::Tag.new(@repository).find_all.should == ["ci_01", "ci_02"]
     end
 
     it "returns an empty array if there are none" do
       mock(@repository).run("git tag") { "" }
-      Tag.new(@repository).find_all.should be_empty
+      AutoTagger::Tag.new(@repository).find_all.should be_empty
     end
   end
 
   describe "#latest_from" do
     before do
-      @tag = Tag.new(@repository)
+      @tag = AutoTagger::Tag.new(@repository)
       mock(@tag).find_all { ["ci/01", "ci/02"] }
     end
 
@@ -42,14 +42,14 @@ describe Tag do
   describe "#fetch_tags" do
     it "sends the correct command" do
       mock(@repository).run!("git fetch origin --tags")
-      Tag.new(@repository).fetch
+      AutoTagger::Tag.new(@repository).fetch
     end
   end
 
   describe "#push" do
     it "sends the correct command" do
       mock(@repository).run!("git push origin --tags")
-      Tag.new(@repository).push
+      AutoTagger::Tag.new(@repository).push
     end
   end
 
@@ -59,7 +59,7 @@ describe Tag do
       mock(Time).now.once {time}
       tag_name = "ci/#{time.utc.strftime('%Y%m%d%H%M%S')}"
       mock(@repository).run!("git tag #{tag_name}")
-      Tag.new(@repository).create("ci").should == tag_name
+      AutoTagger::Tag.new(@repository).create("ci").should == tag_name
     end
   end
 

metadata

@@ -1,28 +1,42 @@
 --- !ruby/object:Gem::Specification 
 name: auto_tagger
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jeff Dean
 - Brian Takita
+- Mike Grafton
+- Bruce Krysiak
+- Pat Nakajima
+- Jay Zeschin
+- Mike Barinek
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 -04:00
+date: 2010-04-25 00:00:00 -04:00
 default_executable: autotag
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
+        - 3
         version: 2.5.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: jeff@zilkey.com
 executables: 
@@ -32,10 +46,12 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- .document
 - .gitignore
 - CHANGELOG
 - MIT-LICENSE
 - README.md
+- Rakefile
 - VERSION
 - auto_tagger.gemspec
 - bin/autotag
@@ -50,14 +66,14 @@ files:
 - features/templates/stage.erb
 - geminstaller.yml
 - lib/auto_tagger.rb
-- lib/auto_tagger/auto_tagger.rb
+- lib/auto_tagger/base.rb
 - lib/auto_tagger/capistrano_helper.rb
 - lib/auto_tagger/commander.rb
+- lib/auto_tagger/recipes.rb
 - lib/auto_tagger/repository.rb
 - lib/auto_tagger/stage_manager.rb
 - lib/auto_tagger/tag.rb
-- recipes/release_tagger.rb
-- spec/auto_tagger/auto_tagger_spec.rb
+- spec/auto_tagger/base_spec.rb
 - spec/auto_tagger/capistrano_helper_spec.rb
 - spec/auto_tagger/commander_spec.rb
 - spec/auto_tagger/repository_spec.rb
@@ -73,28 +89,29 @@ rdoc_options:
 - --charset=UTF-8
 require_paths: 
 - lib
-- recipes
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.3
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Helps you automatically create tags for each stage in a multi-stage deploment and deploy from the latest tag from the previous environment
 test_files: 
-- spec/auto_tagger/auto_tagger_spec.rb
+- spec/auto_tagger/base_spec.rb
 - spec/auto_tagger/capistrano_helper_spec.rb
 - spec/auto_tagger/commander_spec.rb
 - spec/auto_tagger/repository_spec.rb

data/lib/auto_tagger/auto_tagger.rb

@@ -1,26 +0,0 @@
-class AutoTagger
-
-  class EnvironmentCannotBeBlankError < StandardError; end
-
-  attr_reader :stage, :repository, :working_directory
-
-  def initialize(stage, path = nil)
-    raise EnvironmentCannotBeBlankError if stage.to_s.strip == ""
-    @working_directory = File.expand_path(path ||= Dir.pwd)
-    @repository = Repository.new(@working_directory)
-    @stage = stage
-  end
-
-  def create_tag(commit = nil)
-    repository.tags.fetch
-    new_tag = repository.tags.create(stage, commit)
-    repository.tags.push
-    new_tag
-  end
-
-  def latest_tag
-    repository.tags.fetch
-    repository.tags.latest_from(stage)
-  end
-
-end

data/spec/auto_tagger/auto_tagger_spec.rb

@@ -1,85 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe AutoTagger do
-  before(:each) do
-    stub(Dir).pwd { File.join(File.dirname(__FILE__), '..', '..') }
-  end
-
-  describe ".new" do
-    it "blows up if you don't pass an stage" do
-      proc do
-        AutoTagger.new(nil)
-      end.should raise_error(AutoTagger::EnvironmentCannotBeBlankError)
-    end
-
-    it "sets the stage when it's passed" do
-      AutoTagger.new("ci").stage.should == "ci"
-    end
-
-    it "sets the path to Dir.pwd when nil" do
-      mock(Dir).pwd { "/foo" }
-      mock(Repository).new("/foo")
-      AutoTagger.new("ci")
-    end
-
-    it "expands the path when the path is passed" do
-      mock(Repository).new(File.expand_path("."))
-      AutoTagger.new("ci", ".")
-    end
-
-    it "exposes the working directory" do
-      mock(Repository).new(File.expand_path("."))
-      AutoTagger.new("ci", ".").working_directory.should == File.expand_path(".")
-    end
-  end
-
-  describe "#create_tag" do
-    it "generates the correct commands" do
-      time = Time.local(2001,1,1)
-      mock(Time).now.once {time}
-      timestamp = time.utc.strftime('%Y%m%d%H%M%S')
-      mock(File).exists?(anything).twice { true }
-
-      mock(Commander).execute!("/foo", "git fetch origin --tags") {true}
-      mock(Commander).execute!("/foo", "git tag ci/#{timestamp}") {true}
-      mock(Commander).execute!("/foo", "git push origin --tags")  {true}
-
-      AutoTagger.new("ci", "/foo").create_tag
-    end
-
-    it "allows you to base it off an existing tag or commit" do
-      time = Time.local(2001,1,1)
-      mock(Time).now.once {time}
-      timestamp = time.utc.strftime('%Y%m%d%H%M%S')
-      mock(File).exists?(anything).twice { true }
-
-      mock(Commander).execute!("/foo", "git fetch origin --tags") {true}
-      mock(Commander).execute!("/foo", "git tag ci/#{timestamp} guid") {true}
-      mock(Commander).execute!("/foo", "git push origin --tags")  {true}
-
-      AutoTagger.new("ci", "/foo").create_tag("guid")
-    end
-
-    it "returns the tag that was created" do
-      time = Time.local(2001,1,1)
-      mock(Time).now.once {time}
-      timestamp = time.utc.strftime('%Y%m%d%H%M%S')
-      mock(File).exists?(anything).twice { true }
-      mock(Commander).execute!(anything, anything).times(any_times) {true}
-
-      AutoTagger.new("ci", "/foo").create_tag.should == "ci/#{timestamp}"
-    end
-  end
-
-  describe "#latest_tag" do
-    it "generates the correct commands" do
-      mock(File).exists?(anything).twice { true }
-
-      mock(Commander).execute!("/foo", "git fetch origin --tags") {true}
-      mock(Commander).execute("/foo", "git tag") { "ci_01" }
-
-      AutoTagger.new("ci", "/foo").latest_tag
-    end
-  end
-
-end