grifter 0.0.7 → 0.0.8

data/bin/grift

@@ -33,7 +33,7 @@ def parse_cmd_line
     opts.on("-v", "--verbose",
       "debug logging, see every request and response in detail") { Log.level = Logger::DEBUG }
 
-    opts.on("-q", "--verbose",
+    opts.on("-q", "--quiet",
       "quiet logging, warnings and errors only") { Log.level = Logger::WARN }
 
     opts.on("-c", "--config=FILENAME",
@@ -42,7 +42,7 @@ def parse_cmd_line
     opts.on('-e', '--environment=ENVIRONMENT',
            "environment name") { |e| options[:environment] = e.to_sym }
 
-    opts.on("-n", "--no_authenticate",
+    opts.on("-n", "--no-authenticate",
            "Do not authenticate") { options[:authenticate] = false }
 
   end

data/grifter.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "grifter"
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert Schultheis"]

data/lib/grifter/configuration.rb

@@ -69,17 +69,18 @@ class Grifter
 
       #merge any environment overrides into the service block
       if options[:environment]
-        options[:environment] = options[:environment].to_sym
-        unless config[:environments] && config[:environments][options[:environment]]
-          raise GrifterConfigurationError.new "No such environment specified in config: '#{options[:environment]}'"
+        config[:environment] = options[:environment].to_sym
+        unless config[:environments] && config[:environments][config[:environment]]
+          raise GrifterConfigurationError.new "No such environment specified in config: '#{config[:environment]}'"
         end
 
-        config[:environments][options[:environment]].each_pair do |service_name, service_overrides|
+        config[:environments][config[:environment]].each_pair do |service_name, service_overrides|
           config[:services][service_name].merge! service_overrides
         end
+      else
+        config[:environment] = :undefined
       end
 
-
       return config
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grifter
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3913779012589088208
+      hash: -2836288389704495827
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: