clamp 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fb0beef002d49c64a0b25483def9f7f462e8798
-  data.tar.gz: f559b2abacf6f5323b7d168760516eb8a44145df
+  metadata.gz: 9ea677c27d0df2e7b29b4423234f6095c1aafb8b
+  data.tar.gz: a98836b37b03bd4d72e3fe77ac292be2dda6bb14
 SHA512:
-  metadata.gz: 69b29bbdac7c60a424600633a20fe753bd0fe65d872d07e19bcfb482b9218107ec1bba2912d8daf2778604bdaa36b361a107d895fd45b3d69e0b0686c71f6d88
-  data.tar.gz: 946e33f41aa952bcb9ae955621018f0d91843a2771151ba3d4b38661e107c88a0ee857e81d75f565efa6eced4bac8b29d3a7ceab7de93e9010f097e3b84d31ab
+  metadata.gz: f39366b518b4705bf367f7403ff1b5837c7eb984325b96029bb14737b9c02cbcea754abe39c934fc0967de2b4e6cc46516fba66ff5ab4da9493f3627d0bb939b
+  data.tar.gz: b75b6fcda33eb33fec53153c255d8166b3ca131afc7fae36b1a8ecf172633f8bef03583ff55d4a58913ee779f01d03e497572f6528a40410169329f3eef9814a

data/.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.5
   - 2.2.0
+  - 2.3.0
+before_install:
+  - gem update --system
+  - gem install bundler

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.1 (2016-10-01)
+
+* Minor bug-fixes.
+
 ## 1.0.0 (2015-06-08)
 
 * Allow options to be `:hidden`.

data/Gemfile

@@ -2,8 +2,13 @@ source "http://rubygems.org"
 
 gemspec
 
-group :test do
+group :development do
+  gem "guard-rspec", "~> 4.6.5", :require => false
+  gem "listen", "~> 3.0.2"
   gem "rake", "~> 10.4"
+end
+
+group :test do
   gem "rspec", "~> 3.1.0"
   gem "rr", "~> 1.1.2"
 end

data/Guardfile

@@ -0,0 +1,43 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+end

data/examples/defaulted

@@ -0,0 +1,31 @@
+#! /usr/bin/env ruby
+
+# An example of default values and methods
+
+require "clamp"
+require "highline"
+
+Clamp do
+
+  option ["-U", "--user"], "USER", "user name",
+         :environment_variable => "THE_USER",
+         :default => "bob"
+  option ["-P", "--password"], "PASSWORD", "password",
+         :environment_variable => "THE_PASSWORD"
+
+  def execute
+    puts "User: #{user}, Password: #{password}"
+  end
+
+  private
+
+  def default_password
+    terminal.ask("Password [#{user}]: ") { |q| q.echo = '*' }
+  end
+
+  def terminal
+    tty = open("/dev/tty", "w+")
+    HighLine.new(tty, tty)
+  end
+
+end

data/lib/clamp/option/definition.rb

@@ -16,7 +16,7 @@ module Clamp
           @required = options[:required]
           # Do some light validation for conflicting settings.
           if options.has_key?(:default)
-            raise ArgumentError, "Specifying a :default value also :required doesn't make sense"
+            raise ArgumentError, "Specifying a :default value with :required doesn't make sense"
           end
           if type == :flag
             raise ArgumentError, "A required flag (boolean) doesn't make sense."
@@ -83,6 +83,9 @@ module Clamp
       end
 
       def infer_attribute_name
+        unless long_switch
+          raise Clamp::DeclarationError, "You must specify either a long-switch or an :attribute_value"
+        end
         inferred_name = long_switch.sub(/^--(\[no-\])?/, '').tr('-', '_')
         inferred_name += "_list" if multivalued?
         inferred_name

data/lib/clamp/subcommand/execution.rb

@@ -7,13 +7,13 @@ module Clamp
 
       def execute
         # delegate to subcommand
-        subcommand = instatiate_subcommand(subcommand_name)
+        subcommand = instantiate_subcommand(subcommand_name)
         subcommand.run(subcommand_arguments)
       end
 
       private
 
-      def instatiate_subcommand(name)
+      def instantiate_subcommand(name)
         subcommand_class = find_subcommand_class(name)
         parent_attribute_values = {}
         self.class.inheritable_attributes.each do |attribute|

data/lib/clamp/version.rb

@@ -1,3 +1,3 @@
 module Clamp
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clamp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies: []
 description: |
   Clamp provides an object-model for command-line utilities.
@@ -24,11 +24,13 @@ files:
 - ".travis.yml"
 - CHANGES.md
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - clamp.gemspec
 - examples/admin
+- examples/defaulted
 - examples/flipflop
 - examples/fubar
 - examples/gitdown
@@ -81,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: a minimal framework for command-line utilities