git-style-binaries 0.1.11 → 0.2.0

data/README.markdown

@@ -13,7 +13,7 @@ This gem uses [`trollop`](http://trollop.rubyforge.org/) for option parsing
 
 Checkout <a href="http://www.xcombinator.com/movies/git-style-binaries.mov">the new screencast!</a>
 
-<a href="http://www.xcombinator.com/movies/git-style-binaries.mov"><img src="http://github.com/jashmenn/git-style-binaries/tree/master/doc/gsb-screencast.png?raw=true" width='880' height='784' border=0></a>
+<a href="http://www.xcombinator.com/movies/git-style-binaries.mov"><img src="https://raw.github.com/jashmenn/git-style-binaries/master/doc/gsb-screencast.png" width='880' height='784' border=0></a>
 
 ## Try it out
 

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.homepage = "http://github.com/jashmenn/git-style-binaries"
     gem.authors = ["Nate Murray"]
     gem.add_dependency 'trollop'
-    gem.add_dependency 'shoulda' # for running the tests
+    gem.add_development_dependency 'shoulda' # for running the tests
 
     excludes = /(README\.html)/
     gem.files = (FileList["[A-Z]*.*", "{bin,examples,generators,lib,rails,spec,test,vendor}/**/*", 'Rakefile', 'LICENSE*']).delete_if{|f| f =~ excludes}

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 10
+:patch: 11
 :major: 0
 :minor: 1

data/lib/ext/core.rb

@@ -1,8 +1,9 @@
 class Object
-  def returning(value)
-    yield(value)
-    value
-  end unless Object.respond_to?(:returning)
+  # ruby 1.8.6 backport of tap
+  def tap
+    yield(self)
+    self
+  end unless Object.respond_to?(:tap)
 end
 
 class Symbol

data/lib/git-style-binary.rb

@@ -1,19 +1,6 @@
 $:.unshift(File.dirname(__FILE__))
 require 'rubygems'
-
-# Load the vendor gems
-$:.unshift(File.dirname(__FILE__) + "/../vendor/gems")
-%w(trollop).each do |library|
-  begin
-    require "#{library}/lib/#{library}"
-  rescue LoadError
-    begin
-      require 'trollop'
-    rescue LoadError
-      puts "There was an error loading #{library}. Try running 'gem install #{library}' to correct the problem" 
-    end
-  end
-end
+require 'trollop'
 
 require 'ext/core'
 require 'ext/colorize'
@@ -21,7 +8,7 @@ require 'git-style-binary/autorunner'
 Dir[File.dirname(__FILE__) + "/git-style-binary/helpers/*.rb"].each {|f|  require f}
 
 module GitStyleBinary
- 
+
   class << self
     include Helpers::NameResolver
     attr_accessor :current_command
@@ -47,7 +34,7 @@ module GitStyleBinary
     def load_primary
       unless @loaded_primary
         @loaded_primary = true
-        primary_file = File.join(binary_directory, basename) 
+        primary_file = File.join(binary_directory, basename)
         load primary_file
 
         if !GitStyleBinary.primary_command # you still dont have a primary load a default
@@ -76,7 +63,7 @@ module GitStyleBinary
 
     # UGLY eek
     attr_accessor :name_of_command_being_loaded
-   
+
   end
 end
 

data/lib/git-style-binary/command.rb

@@ -2,19 +2,22 @@ require 'git-style-binary'
 
 module GitStyleBinary
   def self.command(&block)
-    returning Command.new(:constraints => [block]) do |c|
-      c.name ||= (GitStyleBinary.name_of_command_being_loaded || GitStyleBinary.current_command_name)
+    Command.new(:constraints => [block]).tap do |c|
+      c.name ||= (GitStyleBinary.name_of_command_being_loaded ||
+                  GitStyleBinary.current_command_name)
       GitStyleBinary.known_commands[c.name] = c
 
-      if !GitStyleBinary.current_command || GitStyleBinary.current_command.is_primary?
+      if !GitStyleBinary.current_command ||
+          GitStyleBinary.current_command.is_primary?
         GitStyleBinary.current_command = c
       end
     end
   end
 
   def self.primary(&block)
-    returning Primary.new(:constraints => [block]) do |c|
-      c.name ||= (GitStyleBinary.name_of_command_being_loaded || GitStyleBinary.current_command_name)
+    Primary.new(:constraints => [block]).tap do |c|
+      c.name ||= (GitStyleBinary.name_of_command_being_loaded ||
+                  GitStyleBinary.current_command_name)
       GitStyleBinary.known_commands[c.name] = c
 
       GitStyleBinary.primary_command = c unless GitStyleBinary.primary_command
@@ -55,7 +58,7 @@ module GitStyleBinary
     end
 
     def parser
-      @parser ||= begin 
+      @parser ||= begin
                     p = Parser.new
                     p.command = self
                     p
@@ -67,11 +70,11 @@ module GitStyleBinary
     end
 
     def run
-      GitStyleBinary.load_primary    unless is_primary?      
+      GitStyleBinary.load_primary    unless is_primary?
       GitStyleBinary.load_subcommand if is_primary? && running_subcommand?
       load_all_parser_constraints
       @opts = process_args_with_subcmd
-      call_parser_run_block      
+      call_parser_run_block
       self
     end
 
@@ -96,23 +99,24 @@ module GitStyleBinary
       parser.consume_all(GitStyleBinary.primary_command.constraints)
     end
 
-    def load_parser_local_constraints 
+    def load_parser_local_constraints
       cur = GitStyleBinary.current_command # see, why isn't 'this' current_command?
 
       unless self.is_primary? && cur == self
-        # TODO TODO - the key lies in this function. figure out when you hav emore engergy
-        # soo UGLY. see #process_parser! unify with that method
-        # parser.consume_all(constraints) rescue ArgumentError
+        # TODO - the key lies in this function. figure out when you
+        # have more energy soo UGLY. see #process_parser! unify with
+        # that method parser.consume_all(constraints) rescue
+        # ArgumentError
         parser.consume_all(cur.constraints)
       end
     end
 
     def call_parser_run_block
       runs = GitStyleBinary.current_command.parser.runs
-      
+
       parser.run_callbacks(:before_run, self)
       parser.runs.last.call(self) # ... not too happy with this
-      parser.run_callbacks(:after_run, self)      
+      parser.run_callbacks(:after_run, self)
     end
 
     def process_args_with_subcmd(args = ARGV, *a, &b)
@@ -124,7 +128,7 @@ module GitStyleBinary
 
     # TOOooootally ugly! why? bc load_parser_local_constraints doesn't work
     # when loading the indivdual commands because it depends on
-    # #current_command. This really sucks and is UGLY. 
+    # #current_command. This really sucks and is UGLY.
     # the todo is to put in 'load_all_parser_constraints' and this works
     def process_parser!
       # load_all_parser_constraints
@@ -135,10 +139,10 @@ module GitStyleBinary
       parser.consume_all(constraints)
 
       # hack
-      parser.consume { 
+      parser.consume {
         opt :version, "Print version and exit" if @version unless @specs[:version] || @long["version"]
         opt :help, "Show this message" unless @specs[:help] || @long["help"]
-        resolve_default_short_options
+        resolve_default_short_options!
       } # hack
     end
 
@@ -170,7 +174,7 @@ module GitStyleBinary
       parser.leftovers
     end
 
-    def short_desc 
+    def short_desc
       parser.short_desc
     end
 
@@ -179,12 +183,18 @@ module GitStyleBinary
       GitStyleBinary.primary_name == name ? GitStyleBinary.primary_name : GitStyleBinary.primary_name + "-" + name
     end
 
+    # die basically ripped out of trollop, because it can't be called
+    # without first calling 'Trollop.options'
     def die arg, msg=nil
-      p = parser # create local copy
-      Trollop.instance_eval { @p = p }
-      Trollop::die(arg, msg)
+      if msg
+        $stderr.puts "Error: #{arg} - #{msg}."
+      else
+        $stderr.puts "Error: #{arg}."
+      end
+      $stderr.puts "Try --help for help."
+      exit(-1)
     end
-    
+
     # Helper to return the option
     def [](k)
       opts[k]

data/test/fixtures/wordpress-post

@@ -6,16 +6,19 @@ GitStyleBinary.command do
   short_desc "create a blog post"
   banner <<-EOS
 SYNOPSIS
-      #{command.full_name} #{all_options_string} {content|STDIN} 
+      #{command.full_name} #{all_options_string} {content|STDIN}
 
 EOS
   opt :blog,     "short name of the blog to use", :default => 'default'
-  opt :category, "tag/category. specify multiple times for multiple categories", :type => String, :multi => true
+  opt :category, "tag/category. specify multiple times for multiple categories",
+                 :type => String, :multi => true
   opt :title,    "title for the post", :required => true, :type => String
-  opt :type,     "type of the content [html|xhtml|text]", :default => 'html', :type => String
+  opt :type,     "type of the content [html|xhtml|text]",
+                 :default => 'html', :type => String
 
   run do |command|
-    command.die :type, "type must be one of [html|xhtml|text]" unless command.opts[:type] =~ /^(x?html|text)$/i
+    command.die :type, "type must be one of [html|xhtml|text]" unless
+      command.opts[:type] =~ /^(x?html|text)$/i
 
     puts "Subcommand name:     #{command.name.inspect}"
     puts "Options:             #{command.opts.inspect}"

data/test/running_binaries_test.rb

@@ -62,7 +62,7 @@ class RunningBinariesTest < Test::Unit::TestCase
     end
     should "be able to require 'primary' and run just fine"
   end
-  
+
   context "when running with an action" do
     # should be the same for both formats
     ["wordpress-categories", "wordpress categories"].each do |bin_format|
@@ -77,7 +77,7 @@ class RunningBinariesTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "callbacks" do
     context "on a binary" do
       setup { @stdout, @stderr = bin("wordpress") }
@@ -86,9 +86,9 @@ class RunningBinariesTest < Test::Unit::TestCase
         should "run the callback #{time}_run}" do
           assert @stdout.match(/#{time}_run command/)
         end
-      end      
+      end
     end
-    
+
     context "on help" do
       setup { @stdout, @stderr = bin("wordpress -h") }
 
@@ -96,11 +96,11 @@ class RunningBinariesTest < Test::Unit::TestCase
         should "not run the callback #{time}_run" do
           assert_nil @stdout.match(/#{time}_run command/)
         end
-      end      
+      end
     end
-    
+
   end
-  
+
 
   context "when running the subcommand" do
     # should be the same for both formats
@@ -110,7 +110,7 @@ class RunningBinariesTest < Test::Unit::TestCase
         context "with no options" do
           setup { @stdout, @stderr = bin("#{bin_format}") }
           should "fail because title is required" do
-            output_matches /Error: option 'title' must be specified.\s*Try --help for help/m
+            output_matches /Error: option --title must be specified.\s*Try --help for help/m
           end
         end
 
@@ -136,7 +136,7 @@ class RunningBinariesTest < Test::Unit::TestCase
           setup { @stdout, @stderr = bin("#{bin_format} --title='glendale' --type=yaml") }
 
           should "die on invalid options"  do
-            output_matches /argument \-\-type type must be one of \[html\|xhtml\|text\]/
+            output_matches /type must be one of \[html\|xhtml\|text\]/
           end
         end
 
@@ -144,9 +144,9 @@ class RunningBinariesTest < Test::Unit::TestCase
     end # end #each
   end
 
-  ["wordpress help post", "wordpress post -h"].each do |format| 
+  ["wordpress help post", "wordpress post -h"].each do |format|
     context "when calling '#{format}'" do
-      
+
       setup { @stdout, @stderr = bin(format) }
       should "have a description" do
         output_matches /create a blog post/

metadata

@@ -1,46 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: git-style-binaries
-version: !ruby/object:Gem::Version 
-  version: 0.1.11
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Nate Murray
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-02-04 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2010-02-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ridiculously easy git-style binaries
 email: nate@natemurray.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - README.markdown
 - Rakefile
 - VERSION.yml
@@ -64,35 +73,32 @@ files:
 - test/running_binaries_test.rb
 - test/shoulda_macros/matching_stdio.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/jashmenn/git-style-binaries
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Add git-style binaries to your project easily.
-test_files: 
+test_files:
 - test/git-style-binary/command_test.rb
 - test/git_style_binary_test.rb
 - test/running_binaries_test.rb