collins_auth 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  metadata.gz: 9d66f3699148c1b27613bbe6988a2e092b6a70b2
+  data.tar.gz: 2b12164630c513d1fd19379c21f8d44bcca15808
+SHA512: 
+  metadata.gz: 9cff54a601c78031421d97f8aecb74fd84342efc186dfa6ed5f111ebfd8c7e5a7780457309153017f2cec30d5bb8a0375c381d58be1dc21ba4d6dd5572e5ccf0
+  data.tar.gz: 43e86f9aca5ed6738ea2bba434017ebca6ed7c03fff060d8cbc4249d044b28cf28e45550eb9b9120bdb34bc9ffdcf501cbaea3a69f50bb76b1f1a3254fa69799

data/lib/collins_auth.rb

@@ -5,7 +5,7 @@ require 'socket'
 
 module Collins
   module Authenticator
-    def self.setup_client(options = {prompt: false})
+    def self.setup_client(options = {:prompt => false})
       if options[:config_file] and not File.readable? options[:config_file]
         raise 'unable to read invalid config file: ' + options[:config_file]
       end
@@ -14,23 +14,23 @@ module Collins
     end
 
     def self.load_config(options = {})
-      conf = (read_config(options[:config_file]) || {}).merge(options) unless options[:prompt] == :only
-      
+      conf = (options[:prompt] == :only) ? {} : (read_config(options[:config_file]) || {}).merge(options)
+
       # check if we have all that we expect
       if [:username, :password, :host].all? {|key| conf.keys.include? key}
         return conf
       end
-      
+
       # Something is missing. Can we prompt for it?
       if options[:prompt]
         conf.merge!(prompt_creds(conf))
       else
         raise "could not load any valid configuration."
       end
-      
+
       conf
     end
-    
+
     private
     def self.file2conf(file)
       if file and File.readable? file
@@ -49,20 +49,20 @@ module Collins
       conf[:host]     ||= ask('host: ') {|host| host.default = ['https://collins', get_domain].compact.join('.')}
       conf
     end
-     
+
     def self.read_config(config_file = nil)
       home_config_file = File.join(ENV['HOME'], '.collins.yml') unless ENV['HOME'].nil?
 
       config_file ||= [ENV['COLLINS_CLIENT_CONFIG'], home_config_file, '/etc/collins.yml', '/var/db/collins.yml'].compact.find do |config_file|
         File.readable? config_file and File.size(config_file) > 0
       end
-      
+
       file2conf config_file
-    end    
-    
+    end
+
     def self.get_domain
       hostname = Socket.gethostname.downcase.split('.')
-      
+
       if hostname.length > 1
         hostname.shift
         hostname.join('.')

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: collins_auth
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Michael Benedict
@@ -10,15 +9,15 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-11-22 00:00:00 Z
+date: 2014-07-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: collins_client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - &id002 
+      - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
@@ -26,14 +25,11 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    - *id002
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 description: This is a library to make it easy to obtain an authenticated collins_client object. It attempts to load credentials from the following yaml files ENV['COLLINS_CLIENT_CONFIG'], ~/.collins.yml, /etc/collins.yml, /var/db/collins.yml, and supports user input.
 email: benedict@tumblr.com
 executables: []
@@ -44,34 +40,30 @@ extra_rdoc_files: []
 
 files: 
 - lib/collins_auth.rb
-- readme.md
 - license.txt
+- readme.md
 homepage: https://github.com/tumblr/collins/tree/master/support/ruby/collins-auth
 licenses: 
 - Apache License 2.0
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  - *id002
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  - *id002
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.3.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Library to aid in getting an authenticated Collins::Client
 test_files: []