mixlib-cli 1.2.0 → 1.2.2

data/README.rdoc

@@ -72,6 +72,11 @@ Available arguments to 'option':
 :exit:: Exit your program with the exit code when this option is specified. Example: 0
 :proc:: If set, the configuration value will be set to the return value of this proc.
 
+=== New in 1.2.2
+
+:required works, and we now support Ruby-style boolean option negation
+(e.g. '--no-cookie' will set 'cookie' to false if the option is boolean)
+
 === New in 1.2.0
 
 We no longer destructively manipulate ARGV.

data/Rakefile

@@ -1,55 +1,41 @@
 require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "mixlib-cli"
-    gem.summary = "A simple mixin for CLI interfaces, including option parsing"
-    gem.email = "info@opscode.com"
-    gem.homepage = "http://www.opscode.com"
-    gem.authors = ["Opscode, Inc."]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install from gemcutter with: sudo gem install gemcutter jeweler"
-end
+require 'rake/gempackagetask'
+require 'rspec/core/rake_task'
+require 'rdoc/task'
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+task :default => :spec
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+desc "Run specs"
+RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
 end
 
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-rescue LoadError
-  task :features do
-    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
-  end
+gem_spec = eval(File.read("mixlib-cli.gemspec"))
+
+Rake::GemPackageTask.new(gem_spec) do |pkg|
+  pkg.gem_spec = gem_spec
 end
 
-task :default => :spec
+desc "install the gem locally"
+task :install => [:package] do
+  sh %{gem install pkg/#{gem_spec.name}-#{gem_spec.version}}
+end
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
+desc "create a gemspec file"
+task :make_spec do
+  File.open("#{gem_spec.name}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
   end
+end
+
+desc "remove build files"
+task :clean do
+  sh %Q{ rm -f pkg/*.gem }
+end
 
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "mixlib-cli #{version}"
+  rdoc.title = "mixlib-cli #{gem_spec.version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/lib/mixlib/cli.rb

@@ -138,19 +138,11 @@ module Mixlib
               raise ArgumentError, "You must pass :on, :tail, or :head to :on"
             end
                       
-          parse_block = case opt_val[:boolean]
-            when true
-              Proc.new() do
-                config[opt_key] = (opt_val[:proc] && opt_val[:proc].call(true)) || true
-                puts opts if opt_val[:show_options]
-                exit opt_val[:exit] if opt_val[:exit]
-              end
-            when false
-              Proc.new() do |c|
-                config[opt_key] = (opt_val[:proc] && opt_val[:proc].call(c)) || c
-                puts opts if opt_val[:show_options]
-                exit opt_val[:exit] if opt_val[:exit]
-              end
+          parse_block =
+            Proc.new() do |c|
+              config[opt_key] = (opt_val[:proc] && opt_val[:proc].call(c)) || c
+              puts opts if opt_val[:show_options]
+              exit opt_val[:exit] if opt_val[:exit]
             end
                     
           full_opt = [ opt_method ]
@@ -163,7 +155,7 @@ module Mixlib
       
       # Deal with any required values
       options.each do |opt_key, opt_value|
-        if opt_value[:required]
+        if opt_value[:required] && !config.has_key?(opt_key)
           reqarg = opt_value[:short] || opt_value[:long]
           puts "You must supply #{reqarg}!"
           puts @opt_parser

data/lib/mixlib/cli/version.rb

@@ -0,0 +1,6 @@
+module Mixlib
+  module CLI
+    VERSION = "1.2.2"
+  end
+end
+

data/spec/mixlib/cli_spec.rb

@@ -156,18 +156,46 @@ describe Mixlib::CLI do
         @cli.config[:i_am_boolean].should == true
       end
       
+      it "should set the corresponding config value to false when a boolean is prefixed with --no" do
+        TestCLI.option(:i_am_boolean, :long => "--[no-]bool", :boolean => true)
+        @cli = TestCLI.new
+        @cli.parse_options([ '--no-bool' ])
+        @cli.config[:i_am_boolean].should == false
+      end
+
       it "should exit if a config option has :exit set" do
         TestCLI.option(:i_am_exit, :short => "-x", :boolean => true, :exit => 0)
         @cli = TestCLI.new
         lambda { @cli.parse_options(["-x"]) }.should raise_error(SystemExit)
       end
-      
+
       it "should exit if a required option is missing" do
         TestCLI.option(:require_me, :short => "-r", :boolean => true, :required => true)
         @cli = TestCLI.new
         lambda { @cli.parse_options([]) }.should raise_error(SystemExit)
       end
-      
+
+      it "should not exit if a required option is specified" do
+        TestCLI.option(:require_me, :short => "-r", :boolean => true, :required => true)
+        @cli = TestCLI.new
+        @cli.parse_options(["-r"])
+        @cli.config[:require_me].should == true
+      end
+
+      it "should not exit if a required boolean option is specified and false" do
+        TestCLI.option(:require_me, :long => "--[no-]req", :boolean => true, :required => true)
+        @cli = TestCLI.new
+        @cli.parse_options(["--no-req"])
+        @cli.config[:require_me].should == false
+      end
+
+      it "should not exit if a required option is specified and empty" do
+        TestCLI.option(:require_me, :short => "-r VALUE", :required => true)
+        @cli = TestCLI.new
+        @cli.parse_options(["-r", ""])
+        @cli.config[:require_me].should == ""
+      end
+
       it "should preserve all of the commandline arguments, ARGV" do
         TestCLI.option(:config_file, :short => "-c CONFIG")
         @cli = TestCLI.new

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mixlib-cli
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Opscode, Inc.
@@ -14,63 +15,62 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 -07:00
+date: 2011-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: 
+description: A simple mixin for CLI interfaces, including option parsing
 email: info@opscode.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.rdoc
-files: 
-- .gitignore
 - LICENSE
 - NOTICE
+files: 
+- LICENSE
 - README.rdoc
 - Rakefile
-- VERSION.yml
-- features/mixlib_cli.feature
-- features/step_definitions/mixlib_cli_steps.rb
-- features/support/env.rb
+- NOTICE
+- lib/mixlib/cli/version.rb
 - lib/mixlib/cli.rb
 - spec/mixlib/cli_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://www.opscode.com
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A simple mixin for CLI interfaces, including option parsing
-test_files: 
-- spec/mixlib/cli_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/.gitignore

@@ -1,6 +0,0 @@
-*.sw?
-.DS_Store
-mixlib-cli.gemspec
-coverage
-rdoc
-pkg

data/VERSION.yml

@@ -1,4 +0,0 @@
---- 
-:major: 1
-:minor: 2 
-:patch: 0 

data/features/mixlib_cli.feature

@@ -1,9 +0,0 @@
-Feature: something something
-  In order to something something
-  A user something something
-  something something something
-
-  Scenario: something something
-    Given inspiration
-    When I create a sweet new gem
-    Then everyone should see how awesome I am

data/features/support/env.rb

@@ -1,9 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
-require 'mixlib_cli'
-
-require 'spec/expectations'
-
-World do |world|
-  
-  world
-end

data/spec/spec.opts

@@ -1,4 +0,0 @@
---colour
---format specdoc
---loadby mtime
---reverse