cloudcover 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a63adaeeea97662bb92f5ff7a09b57982d3f101
-  data.tar.gz: 112b8afe37e3998c86ed74c9c08280a75ed15980
+  metadata.gz: cc7a52c9efd426f2b7fd2438f68d3d9a588dde98
+  data.tar.gz: bede9c874d547cd617abf404c9662111137f541c
 SHA512:
-  metadata.gz: 26f23e4d7d7ebed15e4a51c56d95f621833db58e4dfb4702db1ca4b9c575b000271f60918fdf5b758ca0193d3bad6c3f4067c80323218a2962935b4e71542e40
-  data.tar.gz: a4c5482e7ebd9992ac1693f3e7d4c0635f50678ba88bcc29fe9158f51fe7b8a4aca64340602daaadedb0bf05fdbf0125a48509d86d3988ef11b2352d9ffcf2e9
+  metadata.gz: fe281b19166021c9ff8bb52c4ea45d3f17d797341001775646d37da3fb28429829a8179e4dc8ec2b8f979feb19203a982519310537fc4ea84cc902396b45edeb
+  data.tar.gz: c49f80a026335d4517bea20921f2bddb1ed61d48e8a6fe3cc22e87551030d8410d67ad930eaaba09e2d55179658509980c388fb1ed2adae81dca739d10e2e1d5

data/.gitignore

@@ -1,3 +1,4 @@
+Gemfile.lock
 test.creds
 .DS_Store
 .idea

data/bin/cloudcover

@@ -21,11 +21,11 @@ desc 'Simply verify that a set of credentials are valid to login to Okta. Return
 arg_name '[credential file path]'
 command 'simple-auth' do |c|
   c.switch [:f], :desc => 'Get credentials from file path specified as first argument (Useful for OpenVPN authentication)'
-  c.switch   [:radius], :desc => 'Return RADIUS style Accept/Reject Messages', :default_value => false
+  c.switch   [:radius], :desc => 'Return RADIUS style Accept/Reject Messages', :negatable => false
   c.flag   [:g, :group], :desc => 'Verify membership to the specified group during authentication', :default_value => false
   c.flag   [:c, :context], :desc => 'Extra context for success/fail message', :default_value => false
 
-  c.action do |global_options,options,args|
+  c.action do |global,options,args|
     if options[:f]
       raise CredentialFileError, "No readable credential file specified" unless File.readable?(args.first)
     end
@@ -38,8 +38,9 @@ end
 pre do |global,command,options,args|
   $verbose = global[:verbose] || global[:debug]
   $debug = global[:debug]
-  $config_path = global[:config]
   $color = global[:color]
+  Cloudcover::Config.load(global[:config])
+  Cloudcover::Config.set_config_options(global)
   true
 end
 

data/lib/cloudcover/commands/simple_auth.rb

@@ -5,7 +5,6 @@ module Cloudcover
 
     def initialize(opts,path)
       Output.say_debug("SimpleAuth class: #{self}")
-      @config = Cloudcover::Config.config
       @okta = Cloudcover::Okta::Client.new
       @credentials = {}
       @opts = opts
@@ -82,7 +81,7 @@ module Cloudcover
     end
 
     def date_format
-      @config.has_key?(:date_format) ? @config[:date_format] : "%a %b %e %H:%M:%S %Y"
+      Cloudcover::Config.date_format ? Cloudcover::Config.date_format : "%a %b %e %H:%M:%S %Y"
     end
 
     def group_id

data/lib/cloudcover/config.rb

@@ -1,36 +1,82 @@
 require 'yaml'
 
 module Cloudcover
-  class Config
 
-    def self.config
-     self.new.load_config($config_path)
+  module PrivateAttrAccessor
+    def private_attr_accessor(*names)
+      private
+      attr_accessor *names
     end
+  end
 
-    def load_config(file)
-      Output.say_debug("Loading the config file from #{file}")
-      raise MissingConfig, "Missing configuration file: #{file}  Run 'cloudcover help'" unless File.exist?(file)
-      @cloudcover_config = symbolize_keys(YAML.load_file(file)) rescue {}
-    end
+  class Config
+
+    CONFIG_DEFAULTS = {
+        location: File.join(ENV['HOME'],'.cloudcover'),
+        cookie_location: File.join(ENV['HOME'],'.cloudcover_cookie'),
+    }
+
+    class << self
+      extend PrivateAttrAccessor
+      private_attr_accessor :config_data
+
+      def config
+        CONFIG_DEFAULTS.merge data
+      end
+
+      def load(path)
+        load_config(path)
+        config
+      end
+
+      def set_config_options(opts = {})
+        data.merge! opts
+        config
+      end
+
+      def data
+        self.config_data ||= load_config(CONFIG_DEFAULTS[:location])
+      end
+      private :data
+
+      def default_value(key)
+        CONFIG_DEFAULTS[key.to_sym]
+      end
+      private :default_value
+
+      def method_missing(method, args=false)
+        return data[method] if data[method]
+        return default_value(method) if default_value(method)
+        nil
+      end
+      private :method_missing
+
+      def load_config(file)
+        Output.say_debug("Loading the config file from #{file}")
+        raise MissingConfig, "Missing configuration file: #{file}  Run 'cloudcover help'" unless File.exist?(file)
+        config_data = symbolize_keys(YAML.load_file(file)) rescue {}
+      end
+      private :load_config
 
-    # We want all ouf our YAML loaded keys to be symbols
-    # taken from http://devblog.avdi.org/2009/07/14/recursively-symbolize-keys/
-    def symbolize_keys(hash)
-      hash.inject({}){|result, (key, value)|
-        new_key = case key
-                  when String then key.to_sym
-                  else key
-                  end
-        new_value = case value
-                    when Hash then symbolize_keys(value)
-                    else value
+      # We want all ouf our YAML loaded keys to be symbols
+      # taken from http://devblog.avdi.org/2009/07/14/recursively-symbolize-keys/
+      def symbolize_keys(hash)
+        hash.inject({}){|result, (key, value)|
+          new_key = case key
+                      when String then key.to_sym
+                      else key
                     end
-        result[new_key] = new_value
-        result
-      }
+          new_value = case value
+                        when Hash then symbolize_keys(value)
+                        else value
+                      end
+          result[new_key] = new_value
+          result
+        }
+      end
+      private :symbolize_keys
     end
 
     MissingConfig = Class.new(StandardError)
-    MissingEnvironment = Class.new(StandardError)
   end
 end

data/lib/cloudcover/okta/client.rb

@@ -5,13 +5,12 @@ module Cloudcover
   module Okta
     class Client
       include HTTParty
-      debug_output if $debug
+      debug_output if Cloudcover::Config.debug
 
       attr_reader :headers
 
       def initialize
-        @config = Cloudcover::Config.config
-        self.class.base_uri "https://#{@config[:okta_domain]}.okta.com"
+        self.class.base_uri "https://#{Cloudcover::Config.okta_domain}.okta.com"
         @headers = {
           'Content-Type' => "application/json",
           'Accept' => "application/json",

data/lib/cloudcover/version.rb

@@ -1,3 +1,3 @@
 module Cloudcover
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcover
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Matt Krieger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -146,7 +146,6 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/cloudcover
@@ -185,4 +184,3 @@ specification_version: 4
 summary: Provides a simple interface for using Okta authentication in command line
   applications
 test_files: []
-has_rdoc: 

data/Gemfile.lock

@@ -1,46 +0,0 @@
-PATH
-  remote: .
-  specs:
-    cloudcover (0.0.1)
-      gli (~> 2.13.4)
-      hashdiff
-      highline
-      http-cookie
-      httparty
-      minitar
-      terminal-table
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)
-    gli (2.13.4)
-    hashdiff (0.2.3)
-    highline (1.7.8)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    httparty (0.13.7)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
-    json (1.8.3)
-    minitar (0.5.4)
-    multi_xml (0.5.5)
-    rake (10.4.2)
-    rdoc (4.2.0)
-      json (~> 1.4)
-    terminal-table (1.5.2)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cloudcover!
-  rake
-  rdoc
-
-BUNDLED WITH
-   1.12.3