joe 0.0.3 → 0.1.0

data/README.markdown

@@ -17,13 +17,13 @@ Now go ahead and release your new gem to RubyGems.org:
 
     $ joe release
 
-Easy, right? Wait a few minutes until RubyGems.org updates its gems index and you will be able to run `sudo gem install foo`.
+Easy, right? Wait until RubyGems.org updates its gems index and you will be able to run `gem install foo`.
 
 
 Maintaining a gemspec file
 --------------------------
 
-The easiest way we've found to maintain a gemspec file is by creating a `foo.gemspec.erb` template ([see example](http://github.com/soveran/ohm/blob/e3ff3fb20c1337cb2c4de244e09ce9fa04ef397d/ohm.gemspec.erb)). Then you can use Joe to produce the real gemspec file:
+The easiest way we've found to maintain a gemspec file is by creating a `foo.gemspec.erb` template ([see example](https://github.com/soveran/ohm/blob/master/ohm.gemspec.erb)). Then you can use Joe to produce the real gemspec file:
 
     $ joe gemspec
 
@@ -31,7 +31,7 @@ The easiest way we've found to maintain a gemspec file is by creating a `foo.gem
 Installation
 ------------
 
-    $ sudo gem install joe
+    $ gem install joe
 
 That's it. Try:
 

data/bin/joe

@@ -1,13 +1,61 @@
 #! /usr/bin/env ruby -rubygems
 
 require File.join(File.dirname(__FILE__), "..", "lib", "joe")
+require "clap"
 
-# A way to extend Joe is to write tasks in a Thorfile in the project's root directory.
-# Joe loads the Thorfile if there is one, and all the tasks that are declared in the
-# class Joe become available.
-if File.exists?("Thorfile")
-  load("Thorfile")
+help = <<-EOS
+JOE(1)
+
+NAME
+       joe -- Release your gems, no pain involved.
+
+SYNOPSIS
+       joe COMMAND
+
+DESCRIPTION
+       Joe is a small script that helps you build and release Ruby gems. It only
+       needs a gemspec file or an ERB gemspec template. With joe you can build the
+       gem, install it, archive it and release it to rubygems.org.
+
+USAGE
+       Joe assumes you have a *.gemspec file in the current directory and it will
+       use it to build the gem. If you prefer to use an ERB template, make sure
+       you have the template named *.gemspec.erb.
+
+COMMANDS
+       help        Show this usage guide
+       gemspec     Generate the gemspec file out of the ERB template
+       build       Build the gem
+       install     Build the gem, package it, and install it
+       archive     Create a .tar.gz archive out of the current HEAD
+       release     Push gem to rubygems.org
+
+EXAMPLES
+       If your library is called foo, you need to have foo.gemspec or
+       foo.gemspec.erb available. If you do, the following command will build the
+       gem and release it to rubygems.org.
+
+           joe release
+
+       To install the gem locally without releasing it:
+
+           joe install
+
+SEE ALSO
+       gem(1)
+EOS
+
+if ARGV.empty?
+  puts help
+  exit
 end
 
-# Start the joe tasks.
-Joe.start
+joe = Joe.new
+
+Clap.run ARGV,
+  "gemspec" => joe.method(:gemspec),
+  "build"   => joe.method(:build),
+  "install" => joe.method(:install),
+  "archive" => joe.method(:archive),
+  "release" => joe.method(:release),
+  "help"    => lambda { puts help }

data/lib/joe.rb

@@ -1,67 +1,70 @@
-require "thor"
-require 'fileutils'
-require 'erb'
-require 'rubygems/gem_runner'
+require "fileutils"
+require "erb"
+require "rubygems/gem_runner"
 
-class Joe < Thor
-  VERSION = "0.0.3"
+class Joe
+  VERSION = "0.1.0"
 
-  include Thor::Actions
-
-  desc "gemspec", "Generate the gemspec file out of the ERb template"
   def gemspec
-    template "#{spec_file}.erb", spec_file, :force => true
-  end
+    File.open(spec_file, "w") do |f|
+      f.write ERB.new(File.read("%s.erb" % spec_file), nil, "-").result
 
-  desc "install", "Build the gem, package it and install it"
-  def install
-    build and
-      gem "install", "pkg/#{gem_file}"
+      status :write, spec_file
+    end
+  rescue SyntaxError
+    fail "Parsing your gemspec failed. Please check its syntax."
   end
 
-  desc "build", "Build the gem"
   def build
-    gemspec if File.exists?("#{spec_file}.erb")
+    gemspec if File.exist?("%s.erb" % spec_file)
 
-    gem "build", spec_file
+    gem("build", spec_file)
 
     if pkg(gem_file)
-      say_status :created, gem_file
-      true
+      status :created, "pkg/#{gem_file}"
     else
-      say "Unable to build #{gem_file}"
-      false
+      fail "Unable to build #{gem_file}"
     end
   end
 
-  desc "archive", "Create a .tar.gz archive out of the current HEAD"
+  def install
+    build and gem("install", "pkg/#{gem_file}")
+  end
+
   def archive
-    if system("git archive --prefix=#{spec.name}-#{spec.version}/ --format=tar HEAD | gzip > #{archive_file}") && pkg(archive_file)
-      say_status :created, archive_file
-      true
+    if git_archive && pkg(archive_file)
+      status :created, "pkg/#{archive_file}"
     end
   end
 
-  desc "release", "Publish gem to RubyGems.org"
   def release
     build
-    say "Releasing #{gem_file}..."
-    gem "push", "pkg/#{gem_file}"
-  end
-
-  def self.source_root
-    "."
+    status :releasing, gem_file
+    gem("push", "pkg/#{gem_file}")
   end
 
-protected
-
+private
   def pkg(file)
     FileUtils.mkdir_p("pkg")
     File.exist?(file) && FileUtils.mv(file, "pkg")
   end
 
   def spec_file
-    Dir["*.gemspec"].first || Dir["*.gemspec.erb"].first.sub(/\.erb$/, '')
+    Dir["*.gemspec"].first || Dir["*.gemspec.erb"].first.sub(/\.erb$/, "")
+  end
+
+  def fail(str)
+    puts "\e[1;31m#{str}\e[1;37m"
+  end
+
+  def status(type, message)
+    puts "\e[1;32m %10s \e[1;37m %s" % [type, message]
+
+    return type, message
+  end
+
+  def gem(*args)
+    Gem::GemRunner.new.run(args)
   end
 
   def spec
@@ -69,7 +72,7 @@ protected
       begin
         @spec = eval(File.read(spec_file))
       rescue Errno::ENOENT
-        say_status :not_found, spec_file
+        log :not_found, spec_file
         exit 1
       end
   end
@@ -82,7 +85,8 @@ protected
     gem_file.sub(/\.gem$/, ".tar.gz")
   end
 
-  def gem(*args)
-    Gem::GemRunner.new.run(args)
+  def git_archive
+    system("git archive --prefix=#{spec.name}-#{spec.version}/ " +
+           "--format=tar HEAD | gzip > #{archive_file}")
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Damian Janowski
@@ -15,21 +15,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 -03:00
+date: 2010-11-05 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: clap
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 11
-        version: "0.11"
+        version: "0"
   type: :runtime
   version_requirements: *id001
 description: "Joe builds on top of Thor\xE2\x80\x99s awesomeness to take you from a gem specification to world domination in a single step."