f2y_aws_tool 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1634d466b5e4424aee9ff293191e0d7044f53d6c
-  data.tar.gz: 2e2aaf23e6a18bdc238e640c6efe141cb9da71a4
+  metadata.gz: 2f5a46a374ae7aba60050cc66b413fd851970e06
+  data.tar.gz: 90f7725f6b32753d4a7656d05ffb0289ee7e305c
 SHA512:
-  metadata.gz: 17d893afff97107eae7ad01750fdc64058769108afd54a37d5521c02e76a093da8d9ceb21754fbe5e6f3415418fee69d6dd054469225c04d49ac05d60c69dfed
-  data.tar.gz: 1a5cc1f3f46c1dc37beaccffff7c2ed762006641f4ffade11c20a3bece3de3b6bce7d6e08842624a72faa9be2785c6e0cbf3a1800347776d1baaea7d4f804bf8
+  metadata.gz: 31b827b2ffd1868f919ae0661522aa43a5178d40a62fae461b5397659bc3f4cb6dbd20820d94788200b98c9bfcc71a9c27d7f93699654cc03a1baed5b858f3a9
+  data.tar.gz: 014dc1412b33477450e9ccf6bd9a59b8c52420ee7216f90da17370e929ab5d9792cbed06d81de684c6128939135714e63ce7353cef0942b9465ccfaf06c022f3

data/bin/f2y-aws-tool

@@ -2,17 +2,21 @@
 require "bundler/setup"
 require_relative '../lib/f2y_aws_tool'
 require 'thor'
+require 'byebug'
 
 class F2yAwsToolCli < Thor
-  method_option :stack_id, aliases: "-s", desc: "AWS Opsworks Stack Id", required: true, type: :string
-  method_option :app_id, aliases: "-a", desc: "AWS Opsworks App Id", required: true, type: :string
-  method_option :region, aliases: "-r", desc: "AWS Opsworks Region", required: true, type: :string
-  method_option :wait, aliases: "-w", desc: "Wait until deploy is completed", type: :boolean, default: true
-  method_option :migrate, aliases: "-m", desc: "Migrate database", type: :boolean, default: true
-  method_option :access_key_id, aliases: "-k", desc: "AWS Access Key Id", type: :string, default: ENV['AWS_ACCESS_KEY_ID']
-  method_option :secret_access_key, aliases: "-p", desc: "AWS Secret Access Key", type: :string, default: ENV['AWS_SECRET_ACCESS_KEY']
-  method_option :log_level, aliases: "-l", desc: "Log level", type: :string, default: 'INFO', enum: ['DEBUG', 'INFO', 'ERROR']
-  method_option :log_aws, aliases: "-s", desc: "Enable AWS Log", type: :boolean, default: false
+  method_option :target, desc: "Opsworks Target", type: :hash
+
+  method_option :access_key_id, desc: "AWS Access Key Id", type: :string, default: ENV['AWS_ACCESS_KEY_ID']
+  method_option :secret_access_key, desc: "AWS Secret Access Key", type: :string, default: ENV['AWS_SECRET_ACCESS_KEY']
+  method_option :region, desc: "AWS Opsworks Region", required: false, type: :string
+
+  method_option :wait, desc: "Wait until deploy is completed", type: :boolean, default: true
+  method_option :migrate, desc: "Migrate database", type: :boolean, default: true
+  method_option :log_level, desc: "Log level", type: :string, default: 'INFO', enum: ['DEBUG', 'INFO', 'ERROR']
+  method_option :log_aws, desc: "Enable AWS Log", type: :boolean, default: false
+
+
 
   desc "deploy", "Deploy Opsworks App"
   def deploy

data/f2y_aws_tool.gemspec

@@ -40,5 +40,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor", "0.19.4"
   spec.add_runtime_dependency "aws-sdk", "2.7.7"
   spec.executables << "f2y-aws-tool"
+  spec.add_runtime_dependency "activesupport", "5.0.1"
 
 end

data/lib/f2y_aws_tool.rb

@@ -1,11 +1,15 @@
 require 'aws-sdk'
 require 'yaml'
 require 'log4r'
+require "active_support/hash_with_indifferent_access"
 
 require_relative "./f2y_aws_tool/version"
 require_relative "./f2y_aws_tool/deploy"
 
 module F2yAwsTool
+
+  class MissingAwsCredentials < StandardError; end
+
   extend self
 
   include Log4r
@@ -18,7 +22,7 @@ module F2yAwsTool
   end
 
   def log_format
-    @log_format ||= Log4r::PatternFormatter.new(:pattern => "[%l] %d :: %m", :date_pattern => "%a %d %b %H:%M %p %Y")
+    @log_format ||= Log4r::PatternFormatter.new(:pattern => "F2Y-AWS-TOOL::%l %d :: %m", :date_pattern => "%a %d %b %H:%M %p %Y")
   end
 
   # Your code goes here...

data/lib/f2y_aws_tool/deploy.rb

@@ -43,11 +43,11 @@ module F2yAwsTool
     end
 
     def stack_id
-      @stack_id ||= @options.fetch(:stack_id)
+      @stack_id ||= config.fetch(:stack_id)
     end
 
     def app_id
-      @app_id ||= @options.fetch(:app_id)
+      @app_id ||= config.fetch(:app_id)
     end
 
     def region
@@ -92,6 +92,19 @@ module F2yAwsTool
       )
     end
 
+    def target
+      @target ||= HashWithIndifferentAccess.new(@options.fetch(:target))
+    end
+
+    def config
+      @config ||= begin
+        HashWithIndifferentAccess.new(YAML.load(File.read(target.fetch(:file))))
+      rescue KeyError
+        target
+      end
+    end
+
+
 
   end
 

data/lib/f2y_aws_tool/version.rb

@@ -1,3 +1,3 @@
 module F2yAwsTool
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: f2y_aws_tool
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - nakedmoon
@@ -108,6 +108,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.7
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.0.1
 description: Fit2You Amazon Web Services Tool.
 email:
 - tore.andrea@gmail.com