Skip to content
Browse files

fix gemspec, pre for 0.2.5 release, remove jeweler, update rspec and …

…cucumber
  • Loading branch information...
1 parent 902c182 commit b2b1cabc16e6d19a61e433e887e8424b821cd0c7 @zilkey committed Sep 15, 2011
Showing with 31 additions and 116 deletions.
  1. +8 −1 CHANGELOG
  2. +2 −3 Gemfile
  3. +2 −11 Gemfile.lock
  4. +2 −21 Rakefile
  5. +0 −1 VERSION
  6. +8 −70 auto_tagger.gemspec
  7. +1 −0 lib/auto_tagger.rb
  8. +1 −5 lib/auto_tagger/base.rb
  9. +2 −2 lib/auto_tagger/command_line.rb
  10. +3 −0 lib/auto_tagger/version.rb
  11. +2 −2 spec/auto_tagger/command_line_spec.rb
View
9 CHANGELOG
@@ -1,3 +1,10 @@
+2011-09-15
+ - Fixed broken gemspec that mistakenly included all development dependencies as live dependencies
+ - Removed dependency on jeweler for creating the gemspec
+
+2011-09-14
+ - Order the tags from the previous stage such that you can use auto-incrementing build numbers for refs (thanks Rachel Heaton, Oren Weichselbaum!)
+
2010-11-16
- Setting :auto_tagger_stage or :stage should tag the specified ref (Dave Yeu)
@@ -6,7 +13,7 @@
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 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
View
5 Gemfile
@@ -1,8 +1,7 @@
source :gemcutter
gem "rake", "0.8.7"
-gem "rspec", "2.0.0.beta.19"
-gem "cucumber", "0.8.5"
+gem "rspec"
+gem "cucumber"
gem "capistrano", "2.5.18"
gem "capistrano-ext", "1.2.1"
-gem "jeweler", "1.4.0"
View
13 Gemfile.lock
@@ -17,15 +17,9 @@ GEM
json_pure (~> 1.4.3)
term-ansicolor (~> 1.0.4)
diff-lcs (1.1.2)
- gemcutter (0.6.1)
gherkin (2.1.5)
trollop (~> 1.16.2)
- git (1.2.5)
highline (1.6.1)
- jeweler (1.4.0)
- gemcutter (>= 0.1.0)
- git (>= 1.2.5)
- rubyforge (>= 2.0.0)
json_pure (1.4.3)
net-scp (1.0.2)
net-ssh (>= 1.99.1)
@@ -43,8 +37,6 @@ GEM
rspec-expectations (2.0.0.beta.19)
diff-lcs (>= 1.1.2)
rspec-mocks (2.0.0.beta.19)
- rubyforge (2.0.4)
- json_pure (>= 1.1.7)
term-ansicolor (1.0.5)
trollop (1.16.2)
@@ -54,7 +46,6 @@ PLATFORMS
DEPENDENCIES
capistrano (= 2.5.18)
capistrano-ext (= 1.2.1)
- cucumber (= 0.8.5)
- jeweler (= 1.4.0)
+ cucumber
rake (= 0.8.7)
- rspec (= 2.0.0.beta.19)
+ rspec
View
23 Rakefile
@@ -1,21 +1,2 @@
-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", "Sarah Mei", "Mike Dalessio", "Dave Yeu"]
- gem.add_dependency('capistrano', [">= 2.5.3"])
- gem.require_paths = ["lib"]
- gem.executables = ["autotag"]
- gem.default_executable = %q{autotag}
- gem.date = %q{2010-09-10}
- end
- Jeweler::GemcutterTasks.new
-rescue LoadError
- puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
View
1 VERSION
@@ -1 +0,0 @@
-0.2.4
View
78 auto_tagger.gemspec
@@ -1,88 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/auto_tagger/version', __FILE__)
Gem::Specification.new do |s|
s.name = %q{auto_tagger}
- s.version = "0.2.3"
+
+ s.version = AutoTagger::VERSION
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", "Mike Dalessio", "Dave Yeu"]
- s.date = %q{2010-11-16}
+ s.authors = ["Jeff Dean", "Brian Takita", "Mike Grafton", "Bruce Krysiak", "Pat Nakajima", "Jay Zeschin", "Mike Barinek", "Sarah Mei", "Mike Dalessio", "Dave Yeu", "Rachel Heaton", "Oren Weichselbaum"]
+ s.date = %q{2011-09-15}
s.default_executable = %q{autotag}
s.email = %q{jeff@zilkey.com}
s.executables = ["autotag"]
- s.extra_rdoc_files = [
- "README.md"
- ]
- s.files = [
- ".document",
- ".gitignore",
- "CHANGELOG",
- "Gemfile",
- "Gemfile.lock",
- "MIT-LICENSE",
- "README.md",
- "Rakefile",
- "VERSION",
- "auto_tagger.gemspec",
- "bin/autotag",
- "features/autotag.feature",
- "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",
- "features/templates/deploy.erb",
- "features/templates/stage.erb",
- "lib/auto_tagger.rb",
- "lib/auto_tagger/base.rb",
- "lib/auto_tagger/capistrano_helper.rb",
- "lib/auto_tagger/command_line.rb",
- "lib/auto_tagger/commander.rb",
- "lib/auto_tagger/configuration.rb",
- "lib/auto_tagger/deprecator.rb",
- "lib/auto_tagger/git/ref.rb",
- "lib/auto_tagger/git/ref_set.rb",
- "lib/auto_tagger/git/repo.rb",
- "lib/auto_tagger/options.rb",
- "lib/auto_tagger/recipes.rb",
- "spec/auto_tagger/base_spec.rb",
- "spec/auto_tagger/capistrano_helper_spec.rb",
- "spec/auto_tagger/command_line_spec.rb",
- "spec/auto_tagger/commander_spec.rb",
- "spec/auto_tagger/configuration_spec.rb",
- "spec/auto_tagger/git/ref_set_spec.rb",
- "spec/auto_tagger/git/ref_spec.rb",
- "spec/auto_tagger/git/repo_spec.rb",
- "spec/auto_tagger/options_spec.rb",
- "spec/auto_tagger/recipes_spec.rb",
- "spec/spec_helper.rb"
- ]
+ s.extra_rdoc_files = ["README.md"]
+ s.files = Dir.glob("{bin,lib}/**/*") + %w(MIT-LICENSE README.md CHANGELOG)
s.homepage = %q{http://github.com/zilkey/auto_tagger}
s.rdoc_options = ["--charset=UTF-8"]
s.require_paths = ["lib"]
s.rubygems_version = %q{1.3.7}
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/base_spec.rb",
- "spec/auto_tagger/capistrano_helper_spec.rb",
- "spec/auto_tagger/command_line_spec.rb",
- "spec/auto_tagger/commander_spec.rb",
- "spec/auto_tagger/configuration_spec.rb",
- "spec/auto_tagger/git/ref_set_spec.rb",
- "spec/auto_tagger/git/ref_spec.rb",
- "spec/auto_tagger/git/repo_spec.rb",
- "spec/auto_tagger/options_spec.rb",
- "spec/auto_tagger/recipes_spec.rb",
- "spec/spec_helper.rb"
- ]
+ s.test_files = Dir.glob("{spec,cucumber}/**/*")
if s.respond_to? :specification_version then
- current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
s.specification_version = 3
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
View
1 lib/auto_tagger.rb
@@ -1,5 +1,6 @@
require 'optparse'
[
+ 'version',
'deprecator',
'git/ref',
'git/ref_set',
View
6 lib/auto_tagger/base.rb
@@ -1,9 +1,5 @@
module AutoTagger
- def self.version
- File.read(File.expand_path(File.join(__FILE__, "/../../../VERSION")))
- end
-
class Base
class StageCannotBeBlankError < StandardError;
end
@@ -164,4 +160,4 @@ def ensure_stage
raise StageCannotBeBlankError if configuration.stage.to_s.strip == ""
end
end
-end
+end
View
4 lib/auto_tagger/command_line.rb
@@ -8,7 +8,7 @@ def initialize(args)
def execute
case options[:command]
when :version
- [true, "AutoTagger version #{AutoTagger.version}"]
+ [true, "AutoTagger version #{AutoTagger::VERSION}"]
when :help
[true, options[:help_text]]
when :cleanup
@@ -62,4 +62,4 @@ def options
end
end
-end
+end
View
3 lib/auto_tagger/version.rb
@@ -0,0 +1,3 @@
+module AutoTagger
+ VERSION = "0.2.5"
+end
View
4 spec/auto_tagger/command_line_spec.rb
@@ -6,7 +6,7 @@
it "runs the version command" do
command_line = AutoTagger::CommandLine.new ["version"]
command_line.execute.first.should be_true
- command_line.execute.last.should include(AutoTagger.version)
+ command_line.execute.last.should include(AutoTagger::VERSION)
end
it "runs the help command" do
@@ -107,4 +107,4 @@
end
-end
+end

0 comments on commit b2b1cab

Please sign in to comment.
Something went wrong with that request. Please try again.