jarbs 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80c0ed1b1f5fd38489ea989503475ffdd1758219
-  data.tar.gz: bc04c29c3bc74f163189be69feaa9b5ad4e64dac
+  metadata.gz: 9bd564b81161e04d904a2cc879267146499aaced
+  data.tar.gz: aeb183426fef0c972a8662f5c52d24308daf3bf0
 SHA512:
-  metadata.gz: b3f8059131403aac6efe3b5fc31e45d1a8b7a97886cc649480e4b131d38303d30b26566a2ef3fc8b0b2431b5e1288b5067db59b53712f9bb195ae2c91e84f522
-  data.tar.gz: 4b5b269192663041025ac69be82d7010622404912a6a3dc53e9b154ffc4639aaf8096646bbddcfa3a9cab44fde34d9f570589edae28d523aa642f9c757497b6f
+  metadata.gz: 40d150e9161357387bc3c657ea1b032049ab45d36e30cb1650188c326df4f609846c04c02178b5f6442eed6979d8cb75c6c1fdf0b4593a58e4c858f9824c5518
+  data.tar.gz: e82c148d7d2a06c0082c231ba06b5b1f2acf92ec405e6a7bae2c86a9b851726d1047b04544c06a234be1a5f8070e8dfdad8ad870809b9d4a33254c4f202cb5da

data/lib/jarbs.rb

@@ -37,6 +37,28 @@ module Jarbs
         @config.set('aws.profile', profile)
       end
 
+      command :init do |c|
+        c.syntax = 'jarbs init'
+        c.summary = 'Setup lambda project in an existing directory'
+        c.description = <<-DESC
+Git ignores jarbs project definition file so on checkout of an existing lambda function.
+When checking out a project from source control or transitioning a legacy lambda codebase to use
+with jarbs, you'll need to run this command to setup the initial config and run additional checks
+for compatability.
+        DESC
+        c.action do |args, options|
+          skip_setup = File.exists? '.jarbs'
+          abort('Lambda project already initialized.') if skip_setup
+
+          unless Dir.exists? 'lambdas'
+            say_warning("This doesn't look like a jarbs-enabled project directory (missing lambdas subdir).")
+            skip_setup = !agree('Continue (y/n)? ')
+          end
+
+          Config.touch unless skip_setup
+        end
+      end
+
       command :new do |c|
         c.syntax = 'jarbs new [options] name'
         c.summary = "Generate a new lambda function or project skeleton"
@@ -58,16 +80,22 @@ module Jarbs
       command :deploy do |c|
         c.syntax = 'jarbs deploy [options] directory'
         c.summary = 'Deploy a lambda function to AWS'
-        c.option "--role [STRING]", String, "IAM role for Lambda execution"
+        c.option '--role [STRING]', String, 'IAM role for Lambda execution'
+        c.option '--dry', 'Dry run (do not interact with AWS)'
         c.action do |args, options|
           name = args.shift || abort('Name argument required')
           options.default global_defaults
 
           lambda = Lambda.new(name, options)
-
           abort("Lambda '#{name}' does not exist.") unless lambda.exists?
 
-          lambda.deploy
+          lambda.prepare
+
+          if options.dry
+            say_warning('Dry run: Did not deploy to lambda.')
+          else
+            lambda.deploy
+          end
         end
       end
 
@@ -139,6 +167,5 @@ module Jarbs
     def jarbs_project?
       File.exists?('.jarbs')
     end
-
   end
 end

data/lib/jarbs/config.rb

@@ -2,6 +2,10 @@ module Jarbs
   class Config
     FILE_NAME = '.jarbs'
 
+    def self.touch
+      File.open(FILE_NAME, 'w') {|f| f.write JSON.pretty_generate({}) }
+    end
+
     def initialize(file=FILE_NAME)
       @file = file
       @config = read

data/lib/jarbs/fixtures/.gitignore

@@ -0,0 +1,23 @@
+# Logs
+/logs/
+*.log
+npm-debug.log*
+
+# Coverage things
+/lib-cov/
+/coverage/
+
+# NPM things
+/node_modules/
+/.npm/
+
+# OS things
+.DS_Store
+
+# Misc
+*.swp
+/dest/
+
+# Secrets and config
+.env
+.jarbs

data/lib/jarbs/function_generator.rb

@@ -41,7 +41,7 @@ module Jarbs
     end
 
     def install_handler
-      FileUtils.cp File.join(File.dirname(__FILE__), 'fixtures', 'index.js'), @function.source_path
+      install_fixture('index.js', @function.source_path)
     end
   end
 end

data/lib/jarbs/lambda.rb

@@ -27,12 +27,20 @@ module Jarbs
       FunctionGenerator.new(@function).generate
     end
 
+    def prepare
+      node = NodeBuild.new(@function)
+
+      node.npm_build
+      @package = Packager.new(@function).package
+    ensure
+      node.clean
+    end
+
     def deploy
       deployed? ? update : create
     end
 
     def create
-      data = prepare_for_aws
       role = @options[:role] || ask("IAM role for function: ")
 
       say "Creating #{@function.env_name} on Lambda..."
@@ -44,19 +52,17 @@ module Jarbs
           role: role,
           memory_size: 128,
           timeout: 10,
-          code: { zip_file: data }
+          code: { zip_file: @package }
       end
 
       say_ok "Complete!"
     end
 
     def update
-      data = prepare_for_aws
-
       say "Updating #{@function.env_name} on Lambda..."
 
       capture_errors do
-        @client.update_function_code function_name: @function.env_name, zip_file: data
+        @client.update_function_code function_name: @function.env_name, zip_file: @package
       end
 
       say_ok "Complete!"
@@ -83,16 +89,6 @@ module Jarbs
 
     private
 
-    def prepare_for_aws
-      node = NodeBuild.new(@function)
-
-      node.npm_build
-      package = Packager.new(@function).package
-    ensure
-      node.clean
-      package
-    end
-
     def default_region
       `aws configure get region`.chomp
     end

data/lib/jarbs/manifest_helpers.rb

@@ -1,6 +1,10 @@
 module Jarbs
   module ManifestHelpers
 
+    def install_fixture(fixture_name, path)
+      FileUtils.cp File.join(File.dirname(__FILE__), 'fixtures', fixture_name), path
+    end
+
     def write_package(manifest, path)
       File.open(File.join(path, 'package.json'), 'w') do |f|
         f.write JSON.pretty_generate(manifest)

data/lib/jarbs/project_generator.rb

@@ -33,11 +33,19 @@ module Jarbs
       Dir.chdir(@name)
 
       write_package(manifest, '.')
+      install_gitignore
+
       NodeBuild.new(nil).npm_install('.')
 
       setup_crash_logging
     end
 
+    private
+
+    def install_gitignore
+      install_fixture('.gitignore', '.')
+    end
+
     def setup_crash_logging
       config = Config.new
       autolog = config.get('crashes.report') do

data/lib/jarbs/version.rb

@@ -1,3 +1,3 @@
 module Jarbs
-  VERSION = "0.5.4"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jarbs
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - Luke van der Hoeven
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -156,6 +156,7 @@ files:
 - jarbs.gemspec
 - lib/jarbs.rb
 - lib/jarbs/config.rb
+- lib/jarbs/fixtures/.gitignore
 - lib/jarbs/fixtures/index.js
 - lib/jarbs/function_definition.rb
 - lib/jarbs/function_generator.rb