qops 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5f3299976affb433fc5de4849317a5bbf6470d22
-  data.tar.gz: 6c1a7cdbd26e95c99d53362c128ed8b4f68256ab
+SHA256:
+  metadata.gz: a1e04664fb5d8cf82677fb1f6ce109ea12209e48c338d5cfdc533a2b9537f337
+  data.tar.gz: 3e328659635aef9ce2d5ecda36e491044e4c94e65efbac33212f7cd8f8bc19b2
 SHA512:
-  metadata.gz: f4c4bfe42ccb4c09e97ecde9ceaa37f6f448fa779d053a9353ed508e3fd9fffa670229263f6fecfa11c98ec309729ae92c47690093b152548e61b33f283e1081
-  data.tar.gz: 884b50cfa62e0ea87f44dcc69efa639302b111eb36ddff8a4c17c083152874d4927c9afc4ee7d35c5051217ed012af6a6b8012b52f0885feb241e5190d390cc7
+  metadata.gz: c00d582dc9c65fd047de71b8fccbf2d7d0e8c64259bb1dea2c35881bb2e82c3ecee18ba0f5d5678617d98d89bbb4d0e88cc8dabfebdbbd7970bb48b2864de0e2
+  data.tar.gz: 05aa9df5663df7b5cb27b562810984e84680483dcecc559efd86427444d5ca39904a5da9c9b025ab92b9c8a688f3fa1824374173807156a3837874337a94ea1c

data/lib/qops.rb

@@ -19,6 +19,7 @@ require_relative 'qops/deployment/helpers'
 require_relative 'qops/deployment/app'
 require_relative 'qops/deployment/instances'
 require_relative 'qops/deployment/stacks'
+require_relative 'qops/cookbook/helpers'
 require_relative 'qops/cookbook/cookbook'
 
 # Migrate this into quandl config project

data/lib/qops/cookbook/cookbook.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Qops::Cookbook < Thor
-  include Qops::Helpers
+  include Qops::CookbookHelpers
 
   desc 'vendor', 'Generate vendor directory to contain the cookbooks'
   def vendor
@@ -118,20 +118,6 @@ class Qops::Cookbook < Thor
     config
   end
 
-  def config
-    return @_config if @_config
-
-    @_config ||= Qops::Environment.new
-
-    %w[cookbook_dir cookbook_s3_bucket cookbook_s3_path cookbook_name cookbook_version].each do |var|
-      fail ArgumentError.new("Must specify a '#{var}' in the config") if !@_config.respond_to?(var) && !@_config.configuration.respond_to?(var)
-    end
-
-    fail ArgumentError.new("Cannot find/do not have access to cookbook directory: #{@_config.cookbook_dir}") unless Dir.exist?(@_config.cookbook_dir)
-
-    @_config
-  end
-
   def s3
     @s3 ||= Aws::S3::Client.new(**aws_configs)
   end

data/lib/qops/cookbook/helpers.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Qops::CookbookHelpers
+  extend ActiveSupport::Concern
+
+  include Qops::Helpers
+
+  included do
+    class_option :profile, type: :string, aliases: '-p', desc: 'An AWS profile to use'
+    class_option :force_config, type: :boolean, aliases: '-f', desc: 'Force qops to read options from config. by default qops will search aws opsworks stack'
+    class_option :verbose, type: :boolean, aliases: '-v', desc: 'Provides additional information when running for debugging purposes.'
+  end
+
+  private
+
+  def config
+    return @_config if @_config
+
+    @_config ||= Qops::Environment.new(profile: options[:profile], force_config: options[:force_config], verbose: options[:verbose])
+
+    %w[cookbook_dir cookbook_s3_bucket cookbook_s3_path cookbook_name cookbook_version].each do |var|
+      fail ArgumentError.new("Must specify a '#{var}' in the config") if !@_config.respond_to?(var) && !@_config.configuration.respond_to?(var)
+    end
+
+    fail ArgumentError.new("Cannot find/do not have access to cookbook directory: #{@_config.cookbook_dir}") unless Dir.exist?(@_config.cookbook_dir)
+
+    @_config
+  end
+
+end

data/lib/qops/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Qops
-  VERSION = '1.7.1'
+  VERSION = '1.7.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qops
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Matthew Basset
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -110,6 +110,7 @@ files:
 - bin/qops
 - lib/qops.rb
 - lib/qops/cookbook/cookbook.rb
+- lib/qops/cookbook/helpers.rb
 - lib/qops/deployment/app.rb
 - lib/qops/deployment/helpers.rb
 - lib/qops/deployment/instances.rb
@@ -137,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Helper commands for deployment of opsworks projects.