cloudcover 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbb728764310a4e52eee3275ad788c2e9d7c7878
-  data.tar.gz: 156433fe14e1d78052f70a4432c7eeb74f1a1fef
+  metadata.gz: 827ed9004b2577a85ff3f64e5f483b37c5fe8afa
+  data.tar.gz: b698e0d5fb89f603f180ba778aafb8b2069009a3
 SHA512:
-  metadata.gz: e50396dcbbbce2a0ad2d276847ebf3b8b024f4b09a149bc173d9b41ea3b7527903cf716c3171585ef7f594918e3db97c9f355a351a3880f07c2965d8fd81ca4e
-  data.tar.gz: 8dd3cf589676ca586921628d4cab961d3ef2165d8d018c5c2d3d6791b1f607d5dfb17dbf4b9c3ef7a0851eb3e28f8a892926dd151ce0bc4d90bab52b702c1212
+  metadata.gz: abfae0d9a1d5aab70cf77f39ec43f3edacf959b544fae6c43a14d9c308c6bd2904368112bff23d2abfe3f7af4de7c326d33f469d59327099311939d57b9931ed
+  data.tar.gz: aa4668da2ed37d3ed83bc68ffbe4274d5700601c446f8b1741cba944de2b8ca1a330d3f2f750be391e0ded664dbfe85d86d345d863119600b61d92543220b7bb

data/.gitignore

@@ -3,3 +3,4 @@ test.creds
 .DS_Store
 .idea
 *.gem
+spec/examples.txt

data/bin/cloudcover

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'gli'
 require 'cloudcover'
+require 'pp'
 
 include GLI::App
 
@@ -10,12 +11,27 @@ version Cloudcover::VERSION
 
 subcommand_option_handling :normal
 arguments :strict
+wrap_help_text :verbatim
+sort_help :manually
+
+accept(Hash) do |value|
+  result = {}
+  value.split(/,/).each do |pair|
+    k,v = pair.split(/:/)
+    result[k] = v
+  end
+  result
+end
+
+flag    [:okta_domain],   :desc =>  "Your organization's Okta domain"
+flag    [:config],        :desc => "Cloudcover config file path", :default_value => Cloudcover::DefaultPaths.config
+flag    ['session-path'], :desc => "Cloudcover cookie file path", :default_value => Cloudcover::DefaultPaths.cookie
+flag    [:slack],         :desc =>  Cloudcover::FlagDescriptions.slack, :type => Hash
+
+switch  [:v,:verbose],    :desc => "Verbose output", :negatable => false
+switch  [:d,:debug],      :desc => "Debug output (Includes verbose)", :negatable => false
+switch  [:color],         :desc => "Colorize output", :default_value => true
 
-switch  [:v,:verbose],    :desc => 'Verbose output', :negatable => false
-switch  [:d,:debug],      :desc => 'Debug output (Includes verbose)', :negatable => false
-switch  [:color],         :desc => 'Colorize output', :default_value => true
-flag    [:config],        :desc => 'Cloudcover config file path', :default_value => Cloudcover::DefaultPaths.config
-flag    ['session-path'], :desc => 'Cloudcover cookie file path', :default_value => Cloudcover::DefaultPaths.cookie
 
 desc 'Simply verify that a set of credentials are valid to login to Okta. Returns 0 on success and non-zero on failure.'
 arg_name '[credential file path]'
@@ -36,12 +52,13 @@ command 'simple-auth' do |c|
 end
 
 pre do |global,command,options,args|
-  ENV['HOME'] = "." if ENV['HOME'].nil? # Hack to fix contexts where the env is not set. Should probably find a better way to handle this.
-  $verbose = global[:verbose] || global[:debug]
-  $debug = global[:debug]
-  $color = global[:color]
-  Cloudcover::Config.load(global[:config])
-  Cloudcover::Config.set_config_options(global)
+  Cloudcover::GlobalConfig.load(global[:config]) if global[:config]
+  Cloudcover::GlobalConfig.merge! global.reject{ |key,value| value.nil?}
+  Cloudcover::GlobalConfig.merge! options.reject{ |key,value| value.nil?}
+  if global[:debug]
+    puts "Compiled config: "
+    pp Cloudcover::GlobalConfig.config
+  end
   true
 end
 

data/cloudcover.gemspec

@@ -13,6 +13,7 @@ spec = Gem::Specification.new do |s|
   s.require_paths << 'lib'
   s.bindir = 'bin'
   s.executables << 'cloudcover'
+  s.required_ruby_version = '~> 2.2'
 
   s.add_dependency 'httparty'
   s.add_dependency 'http-cookie'
@@ -20,9 +21,12 @@ spec = Gem::Specification.new do |s|
   s.add_dependency "terminal-table"
   s.add_dependency "minitar"
   s.add_dependency "hashdiff"
+  s.add_dependency "hashie", "~>3.4"
+
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rdoc'
+  s.add_development_dependency 'rspec'
 
 
   s.add_runtime_dependency "gli", "~>2.13.4"

data/lib/cloudcover/commands/simple_auth.rb

@@ -23,6 +23,7 @@ module Cloudcover
     def auth_response(auth, msg)
       if auth
         if  @opts[:radius]
+          send_to_slack(msg) if Cloudcover::GlobalConfig.slack[:report_auth_success]
           p "Accept"
         else
           p msg
@@ -31,7 +32,7 @@ module Cloudcover
         if @opts[:radius]
           abort 'Reject'
         else
-          send_to_slack(msg) if Cloudcover::Config.slack[:report_auth_failures]
+          send_to_slack(msg) if Cloudcover::GlobalConfig.slack[:report_auth_failures]
           abort msg
         end
       end
@@ -82,7 +83,7 @@ module Cloudcover
     end
 
     def date_format
-      Cloudcover::Config.date_format ? Cloudcover::Config.date_format : "%a %b %e %H:%M:%S %Y"
+      Cloudcover::GlobalConfig.date_format ? Cloudcover::GlobalConfig.date_format : "%a %b %e %H:%M:%S %Y"
     end
 
     def app_id
@@ -106,10 +107,10 @@ module Cloudcover
       slackvars = [:username, :icon_url, :channel]
       payload = { text: msg }
       slackvars.each do |var|
-        payload.merge!({var=> Cloudcover::Config.slack[var]}) if Cloudcover::Config.slack[var]
+        payload.merge!({var=> Cloudcover::GlobalConfig.slack[var]}) if Cloudcover::GlobalConfig.slack[var]
       end
 
-      HTTParty.post(Cloudcover::Config.slack[:webhook],
+      HTTParty.post(Cloudcover::GlobalConfig.slack[:webhook],
                     :body => "payload=#{payload.to_json}"
       )
     end

data/lib/cloudcover/config.rb

@@ -1,11 +1,12 @@
 require 'yaml'
+require 'hashie'
 
 module Cloudcover
-
-  module PrivateAttrAccessor
-    def private_attr_accessor(*names)
-      private
-      attr_accessor *names
+  class FlagDescriptions
+    class << self
+      def slack
+        "Hash of slack options\n\tExample: \"username:SlackUser, icon_url:http://fake.url, channel:#test-channel, webhook:https://slack.web.hook\"\n\t"
+      end
     end
   end
 
@@ -25,72 +26,38 @@ module Cloudcover
     end
   end
 
-  class Config
-
-    CONFIG_DEFAULTS = {}
-
-    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
+  module GlobalConfig
+    extend self
 
-      def data
-        self.config_data ||= {}
-      end
-      private :data
-
-      def default_value(key)
-        CONFIG_DEFAULTS[key.to_sym]
-      end
-      private :default_value
+    def config
+      config_data.to_hash
+    end
 
-      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(path)
+      load_config(path)
+      config
+    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)
-        self.config_data = symbolize_keys(YAML.load_file(file)) rescue {}
-      end
-      private :load_config
+    def config_data
+      @config_data ||= Hashie::Mash.new
+    end
+    private :config_data
 
-      # 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
-                      end
-          result[new_key] = new_value
-          result
-        }
-      end
-      private :symbolize_keys
+    def method_missing(method, args=false)
+      config_data.send(method, args)
+    end
+    private :method_missing
 
+    def load_config(file)
+      raise MissingConfig, "Missing configuration file: #{file}  Run 'cloudcover help'" unless File.exist?(file)
+      config_data.merge! YAML.load_file(file)
     end
+    private :load_config
+  end
 
-    MissingConfig = Class.new(StandardError)
+  class ConfigInstance
+    include GlobalConfig
   end
+
+  MissionConfig = Class.new(StandardError)
 end

data/lib/cloudcover/okta/client.rb

@@ -9,8 +9,8 @@ module Cloudcover
       attr_reader :headers
 
       def initialize
-        self.class.debug_output if Cloudcover::Config.debug
-        self.class.base_uri "https://#{Cloudcover::Config.okta_domain}.okta.com"
+        self.class.debug_output if Cloudcover::GlobalConfig.debug
+        self.class.base_uri "https://#{Cloudcover::GlobalConfig.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.2.0'
+  VERSION = '0.2.3'
 end

data/spec/cloudcover/config_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+require 'cloudcover'
+
+module Cloudcover
+    describe GlobalConfig do
+
+      context "config key methods" do
+        it "should return nil when not set" do
+          expect(GlobalConfig.doesnt_exist).to eql(nil)
+          expect(GlobalConfig.doesnt_exist?).to eql(false)
+        end
+        it "should return the config value when set" do
+          GlobalConfig.new_value = "testing"
+          expect(GlobalConfig.new_value).to eql("testing")
+        end
+      end
+
+      context "after loading a config file" do
+        before do
+          config_file = {"domain"=>"example_domain", "slack"=>{"slack_option"=>true, "username"=>"Rspec Tester", "icon_url"=>"http://fake.url", "channel"=>"#test-channel", "webhook"=>"https://slack.web.hook"}}
+          allow(YAML).to receive(:load_file).and_return(config_file)
+          allow(File).to receive(:exist?).and_return(true)
+          GlobalConfig.load("dummy/path")
+        end
+
+        it "calling a method corresponding to a key in the file should return the value" do
+          expect(GlobalConfig.domain).to eql("example_domain")
+          expect(GlobalConfig.slack).to be_kind_of(Hash)
+          expect(GlobalConfig.slack[:slack_option]).to eql(true)
+        end
+
+        it "overwriting values should work" do
+          expect(GlobalConfig.slack).to be_kind_of(Hash)
+          GlobalConfig.slack = "this is a string now"
+          expect(GlobalConfig.slack).to eql("this is a string now")
+        end
+
+      end
+    end
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,24 @@
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.color = true
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+  config.example_status_persistence_file_path = "spec/examples.txt"
+  config.disable_monkey_patching!
+  #config.profile_examples = 10
+  config.order = :random
+  Kernel.srand config.seed
+  config.expose_dsl_globally = true
+   if config.files_to_run.one?
+     config.default_formatter = 'doc'
+   end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcover
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Matt Krieger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +186,8 @@ files:
 - lib/cloudcover/okta/client.rb
 - lib/cloudcover/output.rb
 - lib/cloudcover/version.rb
+- spec/cloudcover/config_spec.rb
+- spec/spec_helper.rb
 homepage: http://www.sportngin.com
 licenses: []
 metadata: {}
@@ -168,9 +198,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -178,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provides a simple interface for using Okta authentication in command line