mixlib-cli 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b83294a142567e4623a4ddd204cdc48744b15a2
-  data.tar.gz: 8ac8ddf99fddb139ffdd9af600ff5d0dffa57ae5
+  metadata.gz: c9f4e332532d344f5c62289e8d814c40b7dc1483
+  data.tar.gz: 8e1da896405b03061d5e3038e926173251adcb61
 SHA512:
-  metadata.gz: 63741ab4ed751ec9a49d4eb11508263a5c092eb7e54325459aa4e269c57611355f1a0b20264126a0eefde285a8a0bf9272f594f739ec5558e8e85aafefe99414
-  data.tar.gz: 3c3e77b4bc304b71de88e1bcea01ce100a308ef853dd0aad9cd6e6d989fd6b0b35fc2f9c685b998bd9f6c17aa7c52dc082c68516586b19f8d6b51f76f418a7c5
+  metadata.gz: 9530b5336675f3086ddc608eb467e96de001533f769d6f237ac1560668befce1bf4323486160faa2bc36dfdac6b9b28ca182bc51ee5d0aa944bc65984b5ef25b
+  data.tar.gz: 790307a0522b70171925d00cf47b7fdad02409505f18558fd5021e7edba38a583603fd0797620d0ff9837fcfc6b44405ba80bfcc769165594de74dcaa9e35bd9

data/lib/mixlib/cli.rb

@@ -135,12 +135,6 @@ module Mixlib
     # `puts opt_parser`, this string will be used as the first line.
     attr_accessor :banner
 
-    # The option parser generated from the mixlib-cli DSL. Set to nil on
-    # initialize; when #parse_options is called +opt_parser+ is set to an
-    # instance of OptionParser. +opt_parser+ can be used to print a help
-    # message including the banner and any CLI options via `puts opt_parser`.
-    attr_accessor :opt_parser
-
     # Create a new Mixlib::CLI class.  If you override this, make sure you call super!
     #
     # === Parameters
@@ -194,7 +188,30 @@ module Mixlib
     # argv<Array>:: Returns any un-parsed elements.
     def parse_options(argv=ARGV)
       argv = argv.dup
-      @opt_parser = OptionParser.new do |opts|
+      opt_parser.parse!(argv)
+
+      # Deal with any required values
+      options.each do |opt_key, opt_value|
+        if opt_value[:required] && !config.has_key?(opt_key)
+          reqarg = opt_value[:short] || opt_value[:long]
+          puts "You must supply #{reqarg}!"
+          puts @opt_parser
+          exit 2
+        end
+      end
+
+      @cli_arguments = argv
+      argv
+    end
+
+
+    # The option parser generated from the mixlib-cli DSL. +opt_parser+ can be
+    # used to print a help message including the banner and any CLI options via
+    # `puts opt_parser`.
+    # === Returns
+    # opt_parser<OptionParser>:: The option parser object.
+    def opt_parser
+      @opt_parser ||= OptionParser.new do |opts|
         # Set the banner
         opts.banner = banner
 
@@ -226,20 +243,6 @@ module Mixlib
           opts.send(*full_opt)
         end
       end
-      @opt_parser.parse!(argv)
-
-      # Deal with any required values
-      options.each do |opt_key, opt_value|
-        if opt_value[:required] && !config.has_key?(opt_key)
-          reqarg = opt_value[:short] || opt_value[:long]
-          puts "You must supply #{reqarg}!"
-          puts @opt_parser
-          exit 2
-        end
-      end
-
-      @cli_arguments = argv
-      argv
     end
 
     def build_option_arguments(opt_setting)

data/lib/mixlib/cli/version.rb

@@ -1,6 +1,6 @@
 module Mixlib
   module CLI
-    VERSION = "1.4.0"
+    VERSION = "1.5.0"
   end
 end
 

data/spec/mixlib/cli_spec.rb

@@ -91,16 +91,15 @@ describe Mixlib::CLI do
       end
     end
 
-    describe "parse_options" do
+    describe "opt_parser" do
+
       it "should set the banner in opt_parse" do
-        @cli.parse_options([])
         @cli.opt_parser.banner.should == @cli.banner
       end
 
       it "should present the arguments in the banner" do
         TestCLI.option(:config_file, :short => "-l LOG")
         @cli = TestCLI.new
-        @cli.parse_options([])
         @cli.opt_parser.to_s.should =~ /-l LOG/
       end
 
@@ -108,7 +107,6 @@ describe Mixlib::CLI do
         TestCLI.option(:config_file, :short => "-l LOG")
         TestCLI.option(:help, :short => "-h", :boolean => true, :on => :tail)
         @cli = TestCLI.new
-        @cli.parse_options([])
         @cli.opt_parser.to_s.split("\n").last.should =~ /-h/
       end
 
@@ -116,7 +114,6 @@ describe Mixlib::CLI do
         TestCLI.option(:config_file, :short => "-l LOG")
         TestCLI.option(:help, :short => "-h", :boolean => true, :on => :head)
         @cli = TestCLI.new
-        @cli.parse_options([])
         @cli.opt_parser.to_s.split("\n")[1].should =~ /-h/
       end
 
@@ -125,13 +122,15 @@ describe Mixlib::CLI do
         TestCLI.option(:beta, :short => "-b BETA")
         TestCLI.option(:zeta, :short => "-z ZETA")
         @cli = TestCLI.new
-        @cli.parse_options([])
         output_lines = @cli.opt_parser.to_s.split("\n")
         output_lines[1].should =~ /-a ALPHA/
         output_lines[2].should =~ /-b BETA/
         output_lines[3].should =~ /-z ZETA/
       end
 
+    end
+
+    describe "parse_options" do
       it "should set the corresponding config value for non-boolean arguments" do
         TestCLI.option(:config_file, :short => "-c CONFIG")
         @cli = TestCLI.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Opscode, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake