noms-optconfig 1.5.3 → 1.6.0

data/bin/bash-showconfig

@@ -20,7 +20,7 @@
 domain="$1"
 shift 1
 
-SCRIPT_VERSION=$(ruby -rubygems -e 'require "optconfig/version"; puts Optconfig::VERSION')
+SCRIPT_VERSION=$(ruby -rubygems -e 'require "noms/optconfig/version"; puts NOMS::Optconfig::VERSION')
 
 echo -n "Using "; which optconfig.sh
 . optconfig.sh

data/bin/optconfig.sh

@@ -33,7 +33,7 @@ opt_new_gen()
    optspec="$1"
    shift 1
    ruby -rubygems \
-      -e 'require "optconfig"' \
+      -e 'require "noms/optconfig"' \
       -e 'require "json"' \
       -e 'require "bashon"' \
       -e '$VERSION = "'$SCRIPT_VERSION'"' \
@@ -41,7 +41,7 @@ opt_new_gen()
       -e 'd = ARGV.shift' \
       -e 'opttext = ARGV.shift' \
       -e 'optspec = JSON.load(opttext)' \
-      -e 'opt = Optconfig.new(d, optspec)' \
+      -e 'opt = NOMS::Optconfig.new(d, optspec)' \
       -e 'puts opt.map { |k,v| v.to_bashon("opt", d, k) }.join(";") + ";" +' \
       -e '   "opt_#{d}_vrb() { local l=\"$1\"; shift 1; test $l -le $(opt_#{d}_verbose) && echo $*; };" + ' \
       -e '   "opt_#{d}_dbg() { local l=\"$1\"; shift 1; test $l -le $(opt_#{d}_debug) && echo \"DBG(#{d}):\" $*; };" + ' \

data/bin/ruby-showconfig

@@ -14,9 +14,9 @@
 # limitations under the License.
 #
 
-require 'optconfig'
+require 'noms/optconfig'
 
-$VERSION = Optconfig::VERSION
+$VERSION = NOMS::Optconfig::VERSION
 
 lib_location = $LOADED_FEATURES.find { |f| f =~ /optconfig.rb$/ }
 
@@ -24,7 +24,7 @@ puts "Using #{lib_location}"
 
 domain = ARGV.shift
 optspec = JSON.load(ARGV.shift)
-opt = Optconfig.new(domain, optspec)
+opt = NOMS::Optconfig.new(domain, optspec)
 puts opt.to_json
 
 # = NAME

data/lib/{bashon.rb → noms/bashon.rb}

@@ -15,7 +15,11 @@
 # limitations under the License.
 # */
 
-module BashOn
+class NOMS
+
+end
+
+module NOMS::BashOn
    def name_key(name)
       name.join('_').gsub(/[^a-zA-Z0-9\_]/, '_')
    end
@@ -262,7 +266,7 @@ EOF
 end
 
 class Object
-   include BashOn
+   include NOMS::BashOn
    def to_bashon(*name)
       if name.empty?
          "#{self.to_s}"
@@ -273,7 +277,7 @@ class Object
 end
 
 class TrueClass
-   include BashOn
+   include NOMS::BashOn
    def to_bashon(*name)
       if name.empty?
          "true"
@@ -284,7 +288,7 @@ class TrueClass
 end
 
 class FalseClass
-   include BashOn
+   include NOMS::BashOn
    def to_bashon(*name)
       if name.empty?
          "false"
@@ -295,7 +299,7 @@ class FalseClass
 end
 
 class NilClass
-   include BashOn
+   include NOMS::BashOn
    def to_bashon(*name)
       if name.empty?
          ""
@@ -306,7 +310,7 @@ class NilClass
 end
 
 class String
-   include BashOn
+   include NOMS::BashOn
 
    def bq
       self.gsub("'", "'\''")
@@ -321,9 +325,17 @@ class String
    end
 end
 
+unless Array.method_defined?(:nitems)
+   class Array
+      def nitems
+         count { |x| !x.nil? }
+      end
+   end
+end
+
 # Enumerable?
 class Array
-   include BashOn
+   include NOMS::BashOn
    def to_bashon(*name)
       "function #{name_key(name)} { echo " +
          (0 .. (self.nitems-1)).map { |i|
@@ -335,7 +347,7 @@ class Array
 end
 
 class Hash
-   include BashOn
+   include NOMS::BashOn
    def to_bashon(*name)
       "function #{name_key(name)} { case \"$1\" in " +
          self.map { |k, v| "#{k}) echo '#{name_key(name + [k])}';;" }.join(' ') +

data/lib/{longopt.rb → noms/longopt.rb}

@@ -17,7 +17,11 @@
 
 require 'getoptlong'
 
-class Longopt < Hash
+class NOMS
+
+end
+
+class NOMS::Longopt < Hash
 
    attr_accessor :optspec
 
@@ -170,7 +174,7 @@ class Longopt < Hash
    @@manpage = <<'EOF'
 =head1 NAME
 
-Longopt - Convenience class similar to Perl Getopt::Long
+NOMS::Longopt - Convenience class similar to Perl Getopt::Long
 
 =head1 SYNOPSIS
 

data/lib/{optconfig.rb → noms/optconfig.rb}

@@ -31,9 +31,13 @@ require 'rubygems'
 require 'longopt'
 require 'json'
 
-class Optconfig < Hash
+class NOMS
 
-    require 'optconfig/version'
+end
+
+class NOMS::Optconfig < Hash
+
+    require 'noms/optconfig/version'
 
    attr_accessor :domain, :optspec, :config, :default
 

data/lib/{optconfig → noms/optconfig}/version.rb

@@ -1,5 +1,5 @@
 class Optconfig
 
-    VERSION = '1.5.3'
+    VERSION = '1.6.0'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noms-optconfig
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -59,8 +59,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
-description: Optconfig presents a standardized way to parse configuration files and
-  command-line arguments
+description: NOMS::Optconfig presents a standardized way to parse configuration files
+  and command-line arguments
 email:
 - jbrinkley@evernote.com
 executables:
@@ -68,10 +68,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/optconfig.rb
-- lib/optconfig/version.rb
-- lib/longopt.rb
-- lib/bashon.rb
+- lib/noms/optconfig.rb
+- lib/noms/optconfig/version.rb
+- lib/noms/longopt.rb
+- lib/noms/bashon.rb
 - bin/ruby-showconfig
 - bin/optconfig.sh
 - bin/bash-showconfig