jarbs 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00319947788f0b023a2448fa5ec31590d0daaa40
-  data.tar.gz: 57727ea98e33ba9322fd2280387c4439f02a257b
+  metadata.gz: 7e0b7e12ac209ca690fa3878add1fa2dd87fcd4a
+  data.tar.gz: faef4d7bab85db92b5d63c07c2ebf5f7b65420ac
 SHA512:
-  metadata.gz: ca6ef2149782919ad94d4542d339bdf41aee825e1fd475104c1da06753cc94c5e61d94e2e838ad06237bcfb7f3a680e29d2241a8f5736055bf8e630a71a8f201
-  data.tar.gz: 56ef77f08d6487dbddaa317a6b85871d75ffee5ae72238cacb4ab0766db1939529316442fadc60e032f67a88f317fdeafba5cbba5d20b1a9bb78e53466a29d74
+  metadata.gz: 947badeb36fab1e41d7d415c4e08fbd0caf60b13dba5544f116fa7f1be70025cf0fb8bd3f66b18a16f97d1c7f66990eb768f2253bd83d62b1deaaaa4ba75ceaa
+  data.tar.gz: 9e19e63289b56712357b2bd86a45feabe35f4c26a29c0fbfe51808e69a5374b6a82fc64da11e30cec0f68282978df00ceda6347f54a71fd522da945e59707e13

data/lib/jarbs.rb

@@ -19,9 +19,9 @@ module Jarbs
     def initialize
       @config = Config.new
 
-      if @config.get('crashes.report')
+      if @config.get('crashes.report', from_global: true)
         CrashReporter.configure do |c|
-          c.engines = [CrashReporter::GithubIssues.new('articulate/jarbs', @config.get('github.token'))]
+          c.engines = [CrashReporter::GithubIssues.new('articulate/jarbs', @config.get('github.token', from_global: true))]
           c.version = Jarbs::VERSION
         end
       end
@@ -33,10 +33,30 @@ module Jarbs
 
       global_option('-e', '--env [dev]', String, 'Set deployment environment')
       global_option('-d', '--debug', 'Enable debug mode') { $debug = true }
-      global_option('-p', '--profile [default]', String, 'AWS credential profile to use') do |profile|
+      global_option('-p', '--profile PROFILE', String, 'AWS credential profile to use') do |profile|
         @config.set('aws.profile', profile)
       end
 
+      command :config do |c|
+        c.syntax = 'jarbs config [options]'
+        c.option '-g', '--global', String, "Use global config"
+        c.action do |args, options|
+          method = args.shift
+
+          if method == 'set'
+            args.each do |settings|
+              k, v = settings.split("=")
+
+              @config.set(k, v, from_global: options.global)
+            end
+          elsif method == 'get'
+            @config.get(args.first, from_global: options.global)
+          else
+            @config.print(for_global: options.global)
+          end
+        end
+      end
+
       command :init do |c|
         c.syntax = 'jarbs init'
         c.summary = 'Setup lambda project in an existing directory'
@@ -156,7 +176,7 @@ for compatability.
     private
 
     def profile
-      @config.get('aws.profile') { 'default' }
+      @config.get('aws.profile') || 'default'
     end
 
     def global_defaults
@@ -178,7 +198,7 @@ for compatability.
         if remove
           lambda.function.remove!
         else
-          abort("Function #{lambda.name} exists. Use the -f flag to force overwrite.")
+          abort("Function #{lambda.function.name} exists. Use the -f flag to force overwrite.")
         end
       end
     end

data/lib/jarbs/config.rb

@@ -1,9 +1,17 @@
+require 'pp'
+
 module Jarbs
   class Config
     FILE_NAME = '.jarbs'
+    GLOBAL_CONFIG = File.join(Dir.home, FILE_NAME)
+
+    def self.touch(for_global: false)
+      path = for_global ? GLOBAL_CONFIG : FILE_NAME
+      File.open(path, 'w') {|f| f.write JSON.pretty_generate({}) }
+    end
 
-    def self.touch
-      File.open(FILE_NAME, 'w') {|f| f.write JSON.pretty_generate({}) }
+    def self.global
+      new GLOBAL_CONFIG
     end
 
     def initialize(file=FILE_NAME)
@@ -11,12 +19,20 @@ module Jarbs
       @config = read
     end
 
-    def set(key, value)
+    def global
+      @global ||= self.class.global
+    end
+
+    def set(key, value, from_global: false)
+      return global.set(key, value) if from_global
+
       @config[key] = value
       finalize
     end
 
-    def get(key, &block)
+    def get(key, from_global: false, &block)
+      return global.get(key, &block) if from_global
+
       val = @config[key]
 
       if !val && block_given?
@@ -27,6 +43,12 @@ module Jarbs
       val
     end
 
+    def print(for_global: false)
+      return global.print if for_global
+
+      pp @config
+    end
+
     private
 
     def finalize

data/lib/jarbs/github_auth.rb

@@ -13,7 +13,7 @@ module Jarbs
 
     def generate_token(name)
       resp = @client.create_authorization scopes: ['public_repo'],
-                                          note: "Jarbs error reporting for #{name}",
+                                          note: "Jarbs error reporting",
                                           headers: { 'X-GitHub-OTP' => ask('GitHub two-factor token: ') }
 
       @config.set('github.token', resp.token)

data/lib/jarbs/lambda.rb

@@ -48,12 +48,12 @@ module Jarbs
 
       capture_errors do
         @client.create_function function_name: @function.env_name,
-          runtime: 'nodejs',
-          handler: 'index.handler',
-          role: role,
-          memory_size: 128,
-          timeout: 10,
-          code: { zip_file: @package }
+                                runtime: 'nodejs',
+                                handler: 'index.handler',
+                                role: role,
+                                memory_size: 128,
+                                timeout: 10,
+                                code: { zip_file: @package }
       end
 
       say_ok "Complete!"
@@ -63,7 +63,8 @@ module Jarbs
       say "Updating #{@function.env_name} on Lambda..."
 
       capture_errors do
-        @client.update_function_code function_name: @function.env_name, zip_file: @package
+        @client.update_function_code function_name: @function.env_name,
+                                     zip_file: @package
       end
 
       say_ok "Complete!"

data/lib/jarbs/project_generator.rb

@@ -47,7 +47,7 @@ module Jarbs
     end
 
     def setup_crash_logging
-      config = Config.new
+      config = Config.global
       autolog = config.get('crashes.report') do
         agree("Would you like to log jarbs crashes to GitHub automatically (y/n)? ")
       end

data/lib/jarbs/version.rb

@@ -1,3 +1,3 @@
 module Jarbs
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jarbs
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Luke van der Hoeven
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander