mercenary 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f441ca546550e0899b4f6aa2135994f482d5d29
-  data.tar.gz: d5d7fd3ecd26cf8065b78fd51575c0fe197b9557
+  metadata.gz: 87eebf74783259bf4e3c5cbc9e3afede61659dd4
+  data.tar.gz: ca77110aa931e23251435f575b14af771781932a
 SHA512:
-  metadata.gz: bd7eaa27cbe85b82a1997eb6b73b429707c5a63c38e1f09b144eed56f04e819e35759e2b3a7d65bb4c977d87998e7d174544f023c2aa4a0e4f32362f5b9dcf9f
-  data.tar.gz: dbf6c19a22daf82dffd6ca7007d9fea7e32e18fe170da8c972779db8e2e76826956028d90febc845b75c79f11377817da42683d3db3291d4faf22440c47b27ff
+  metadata.gz: 3b8bf7ccc50c989fdd2a06bc088d8219254ba7eeb49d8dd42ccba83ceaf12b28f6ef74b5ca3a7cdf568a673da320242019fb0970821aafc95a37014dec2e06a6
+  data.tar.gz: 0f2f3400b7ee7ac5350084294689567132ce5f536b6c9114a403479cda32cffa0fb1ab9267528a3146dbb06ec99af0dad952d4abcef37047920b87bb86a48c02

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-script: "bundle exec rspec"
+script: "./script/cibuild"
 notification:
   recipients:
     - mercenary@jekyllrb.com

data/History.markdown

@@ -0,0 +1,51 @@
+## HEAD
+
+### Major Enhancements
+
+### Minor Enhancements
+
+### Bug Fixes
+
+### Development Fixes
+
+## 0.2.0 / 2013-11-30
+
+### Major Enhancements
+
+* Add `Command#default_command` to specify a default command if none is given
+  by the user at runtime (#7)
+
+### Minor Enhancements
+
+* Add `Command#execute` to execute the actions of a command (#6)
+
+### Development Fixes
+
+* Add standard GitHub bootstrap and cibuild scripts to `script/` (#2)
+
+## 0.1.0 / 2013-11-08
+
+### Major Enhancements
+
+* It works!
+
+### Minor Enhancements
+
+* Add a logger to `Command`
+* Add `--version` switch to all programs
+
+### Bug Fixes
+
+* Fix `Command#syntax` and `Command#description`'s handing of setting vs getting
+* Fix load path problem in `lib/mercenary.rb`
+
+### Development Fixes
+
+* Add TomDoc to everything
+* Add a couple starter specs
+* Add TravisCI badge
+* Add Travis configuration
+
+## 0.0.1 / 2013-11-06
+
+* Birthday!

data/README.md

@@ -34,6 +34,19 @@ Mercenary.program(:jekyll) do |p|
     end
   end
 
+  p.command(:build) do |c|
+    c.syntax "jekyll build [options]"
+    c.description "Builds your Jekyll site"
+
+    c.option 'safe', '--safe', 'Run in safe mode'
+    c.option 'source', '--source DIR', 'From where to collect the source files'
+    c.option 'destination', '--dest DIR', 'To where the compiled files should be written'
+
+    c.action do |_, options|
+      Jekyll::Commands::Build.process(options)
+    end
+  end
+
   p.command(:import) do |c|
     c.syntax "jekyll import <platform> [options]"
     c.description "Import your old blog to Jekyll"
@@ -51,6 +64,8 @@ Mercenary.program(:jekyll) do |p|
       Jekyll::Commands::Import.process(args.first, options)
     end
   end
+
+  p.default_command(:build)
 end
 ```
 

data/lib/mercenary/command.rb

@@ -45,6 +45,25 @@ module Mercenary
       @description
     end
 
+    # Public: Sets the default command
+    #
+    # command_name - the command name to be executed in the event no args are
+    #                present
+    #
+    # Returns the default command if there is one, `nil` otherwise
+    def default_command(command_name = nil)
+      if command_name
+        if commands.has_key?(command_name)
+          @default_command = commands[command_name] if command_name
+          @default_command
+        else
+          raise ArgumentError.new("'#{command_name}' couldn't be found in this command's list of commands.")
+        end
+      else
+        @default_command
+      end
+    end
+
     # Public: Adds an option switch
     #
     # sym - the variable key which is used to identify the value of the switch
@@ -141,6 +160,20 @@ module Mercenary
       end
     end
 
+    # Public: Execute all actions given the inputted args and options
+    #
+    # argv - (optional) command-line args (sans opts)
+    # config - (optional) the Hash configuration of string key to value
+    #
+    # Returns nothing
+    def execute(argv = [], config = {})
+      if actions.empty? && !default_command.nil?
+        default_command.execute
+      else
+        actions.each { |a| a.call(argv, config) }
+      end
+    end
+
     # Public: Check if this command has a subcommand
     #
     # sub_command - the name of the subcommand

data/lib/mercenary/program.rb

@@ -46,7 +46,7 @@ module Mercenary
 
       logger.debug("Parsed config: #{@config.inspect}")
 
-      cmd.actions.each { |a| a.call(argv, @config) }
+      cmd.execute(argv, @config)
     end
   end
 end

data/lib/mercenary/version.rb

@@ -1,3 +1,3 @@
 module Mercenary
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/script/bootstrap

@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -e
+
+echo "Time to get set up."
+bundle install
+echo "Boom."

data/script/cibuild

@@ -0,0 +1,3 @@
+#! /bin/sh
+
+bundle exec rspec

data/spec/command_spec.rb

@@ -4,13 +4,18 @@ describe(Mercenary::Command) do
 
   context "a basic command" do
     let(:command) { Mercenary::Command.new(:my_name) }
+    let(:parent)  { Mercenary::Command.new(:my_parent) }
+    let(:with_sub) do
+      c = Mercenary::Command.new(:i_have_subcommand)
+      add_sub.call(c)
+      c
+    end
     let(:command_with_parent) do
       Mercenary::Command.new(
         :i_have_parent,
         parent
       )
     end
-    let(:parent)  { Mercenary::Command.new(:my_parent) }
     let(:add_sub) do
       Proc.new do |c|
         c.command(:sub_command) { |p| }
@@ -50,6 +55,15 @@ describe(Mercenary::Command) do
       expect(command.options).to eq([opt])
       expect(command.map).to include({opt.first => name})
     end
+
+    it "raises an ArgumentError if I specify a default_command that isn't there" do
+      c = command # some weird NameError with the block below?
+      expect { c.default_command(:nope) }.to raise_error(ArgumentError)
+    end
+
+    it "sets the default_command" do
+      expect(with_sub.default_command(:sub_command).name).to eq(:sub_command)
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercenary
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,6 +65,7 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
+- History.markdown
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -73,6 +74,8 @@ files:
 - lib/mercenary/program.rb
 - lib/mercenary/version.rb
 - mercenary.gemspec
+- script/bootstrap
+- script/cibuild
 - spec/command_spec.rb
 - spec/program_spec.rb
 - spec/spec_helper.rb
@@ -96,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Lightweight and flexible library for writing command-line apps in Ruby.