choosy 0.3.1 → 0.3.3

data/Rakefile

@@ -1,20 +1,16 @@
-begin
-  require 'choosy/versiontask'
-rescue LoadError => e
-  $LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib')
-  require 'choosy/versiontask'
-end
-
 require 'rubygems'
 require 'rake'
 require 'rspec/core/rake_task'
-require 'bundler'
-Bundler::GemHelper.install_tasks
 
-PACKAGE_NAME = "choosy"
+begin
+  require 'choosy/rake'
+rescue LoadError => e
+  $LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib')
+  require 'choosy/rake'
+end
 
 desc "Default task"
-task :default => [ :spec ]
+task :default => [:spec]
 
 desc "Run the RSpec tests"
 RSpec::Core::RakeTask.new :spec
@@ -50,20 +46,7 @@ desc "Create RDocs: TODO"
 task :rdoc
 
 desc "Cleans the generated files."
-task :clean do
-  rm Dir.glob('*.gemspec')
-  rm Dir.glob('*.gem')
-  rm_rf 'pkg'
-end
+task :clean => ['gem:clean']
 
-desc "Deploys the gem to rubygems.org"
-task :gem => [:doc, :version] do
-  sh "gem build #{PACKAGE_NAME}.gemspec"
-  sh "gem push #{PACKAGE_NAME}-#{$version}.gem"
-  sh "git tag -m 'Tagging release #{$version}' v#{$version}"
-  sh "git push origin :refs/tags/#{$version}"
-end
-
-desc "Does the full release cycle."
-task :deploy => [:gem, :clean] do
-end
+desc "Runs the full deploy"
+task :push => [:release, :clean]

data/lib/VERSION.yml

@@ -2,5 +2,5 @@
 version: 
   major: 0
   minor: 3
-  tiny: 1
+  tiny: 3
 date: 25/03/2011

data/lib/choosy/rake.rb

@@ -0,0 +1,131 @@
+
+# This is a library task that others can use to expose functionality in their rake files
+# It defines the '$version' global variable to let users pull this information out
+# into their own scripts.
+
+module SH
+  def self.attempt(command, options={}, &block)
+    contents = nil
+    IO.popen("#{command} 2>&1", 'r') do |io|
+      contents = io.read
+    end
+    if $? != 0
+      yield [$?, contents] if block_given?
+
+      if options[:error]
+        raise options[:error]
+      else
+        puts contents
+        raise "Unable to execute command: #{command}" unless options[:fail] == false
+      end
+    end 
+
+    if options[:success] && contents !~ options[:success]
+      raise "Command failed: #{command}"
+    elsif options[:failure] && contents =~ options[:failure]
+      raise "Command didn't succeed: #{command}"
+    end
+
+    puts contents unless options[:quiet]
+  end
+
+  def self.files(ending_with, &block)
+    files = Dir.glob("*#{ending_with}")
+
+    raise "No #{ending_with} files found." if files.empty?
+    
+    files.each do |file|
+      yield file
+    end
+  end
+end
+
+#########################################################################
+# Version
+require 'choosy/version'
+
+desc "Shows the current version number."
+task :version => ['version:load'] do
+  puts "Current version: #{$version.to_s}"
+end
+
+namespace :version do
+  task :load do
+    puts Dir.pwd
+    if ENV['VERSION_FILE']
+      $version = Choosy::Version.new(ENV['VERSION_FILE'])
+    else
+      $version = Choosy::Version.load(:dir => Dir.pwd, :relpath => 'lib')
+    end
+  end
+
+  [:tiny, :minor, :major].each do |type|
+    desc "Bumps the #{type} revision number."
+    task type => :load do
+      old = $version.to_s
+      $version.version!(type)
+      puts "Bumped version: #{old} -> #{$version}"
+    end
+  end
+end
+
+#########################################################################
+# Release
+desc "Tags the current release in git, builds the gemspec, and pushes the gem"
+task :release => ['gem:push', 'git:tag', 'git:push']
+
+#########################################################################
+# Git
+namespace :git do
+  task :diff => ['version:load'] do
+    SH.attempt "git diff --exit-code", :error => "git diff: Your work doesn't seem to be checked in!", :quiet => true
+  end
+
+  task :tag => [:diff, 'version:load'] do
+    sh "Tagging version #{$version}"
+    SH.attempt "git tag -a -m 'Tagging release #{$version}' v#{$version}" do |code, contents|
+      SH.attempt "git tag -d v#{$version}", :error => "git tag: unable to delete tag"
+      raise "Unable to commit tag."
+    end
+  end
+
+  task :push => [:diff, 'version:load'] do
+    SH.attempt "git push"
+    SH.attempt "git push --tags"
+  end
+end
+
+#########################################################################
+# Gems
+desc "Build the current gemspecs."
+task :gem => ['gem:build']
+
+namespace :gem do
+  desc "Builds the current gemspec."
+  task :build do
+    SH.files('gemspec') do |gemspec|
+      puts "  Building gemspec: #{gemspec}"
+      SH.attempt "gem build #{gemspec}"
+    end
+  end
+  
+  desc "Pushes the current gem."
+  task :push => :build do
+    SH.files ("#{$version}.gem") do |gem|
+      puts "  Pushing gems: #{gem}"
+      SH.attempt "gem push #{gem}"
+    end
+  end
+
+  desc "Installs the current gem."
+  task :install => :build do
+    SH.files ("#{$version}.gem") do |gem|
+      puts "  Installing gem: #{gem}"
+      SH.attempt "gem install --no-ri --no-rdoc #{gem}"
+    end
+  end
+
+  task :clean do
+    rm Dir.glob('*.gem')
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Gabe McArthur
@@ -78,6 +78,7 @@ files:
 - lib/VERSION.yml
 - lib/choosy/errors.rb
 - lib/choosy/printing.rb
+- lib/choosy/rake.rb
 - lib/choosy/converter.rb
 - lib/choosy/parse_result.rb
 - lib/choosy/verifier.rb
@@ -92,7 +93,6 @@ files:
 - lib/choosy/dsl/command_builder.rb
 - lib/choosy/dsl/option_builder.rb
 - lib/choosy/dsl/base_command_builder.rb
-- lib/choosy/versiontask.rb
 - lib/choosy/parser.rb
 - lib/choosy/base_command.rb
 - lib/choosy/printing/manpage_printer.rb

data/lib/choosy/versiontask.rb

@@ -1,30 +0,0 @@
-
-# This is a library task that others can use to expose functionality in their rake files
-# It defines the '$version' global variable to let users pull this information out
-# into their own scripts.
-
-require 'choosy/version'
-
-desc "Shows the current version number."
-task :version => ['version:load'] do
-  puts "Current version: #{$version.to_s}"
-end
-
-namespace :version do
-  task :load do
-    puts Dir.pwd
-    if ENV['VERSION_FILE']
-      $version = Choosy::Version.new(ENV['VERSION_FILE'])
-    else
-      $version = Choosy::Version.load(:dir => Dir.pwd, :relpath => 'lib')
-    end
-  end
-
-  [:tiny, :minor, :major].each do |type|
-    desc "Bumps the #{type} revision number."
-    task type => :load do
-      $version.version!(type)
-      puts "New version: #{$version.to_s}"
-    end
-  end
-end