jarbs 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aee7bfc746ed5e58dfd6577850abab88c2c09d4
-  data.tar.gz: 5fb103e40bce30237c937ef469b35830a83253fc
+  metadata.gz: 5bccaf78f308809bfd3db697d8ce78253dd09397
+  data.tar.gz: e5c01044236be1a93eace8106f9464d5ffc91fb5
 SHA512:
-  metadata.gz: 5e9bb53cf84b6df0e0da406859c7a6ad48b8a94c531997888010154b86e39f6bfac5774372e7acea2e8eb9f777047959135dbace13ff78ff3d886588ee03591f
-  data.tar.gz: 12d91612386943a5172caee840032a3896283d85f479f646083dffd4d33c846625153a2db9fe7017ed3cf8fdeb51f496e98da6b6619acc7aaea67acc3663a4b9
+  metadata.gz: 7dd415e13e4e86ca2d55133b162c7b404b97c3685ad4c215e3e7926945e194b8f6f973ab10db78c02213089b03a40160669c20420a008ff9456ceb7c08f093a5
+  data.tar.gz: e83e3b3003ccaa8acf3fc1268a055100c482ee7e770700f0b3a8769f62de32d31e5c7e3a6f9dbc56e10a0bce400a5472be2deed34d1a79d76cde5bc02a600f5d

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright 2015 Articulate Global, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -10,15 +10,13 @@ Currently we distributed the `jarbs` runtime via gems hosted by RubyGems.org.
 
 `gem install jarbs`
 
-If this is a new machine or you haven't had to install any C extentions for Ruby yet, you may also need `cmake` before this gem will install: `brew install cmake`. We're looking at options for eliminating this step.
-
 ## Usage
 
 For the most up-to-date documentation and usage, run `jarbs -h`
 
 ### Generate a new lambda project:
 
-`lambda new my-function`
+`jarbs new my-function`
 
 This produces:
 
@@ -36,7 +34,7 @@ This produces:
 
 (while in the project folder created above):
 
-`lambda new other-function`
+`jarbs new other-function`
 
 Your project will then look like:
 
@@ -78,5 +76,5 @@ Will destroy the lambda function on AWS (will still leave files in your lambdas
 
 ## License
 
-*MIT*
+This software is provided under the the [MIT license](LICENSE).
 

data/Rakefile

@@ -1,11 +1,10 @@
 require "bundler/gem_tasks"
-require 'jarbs/version'
-# require "rake/testtask"
+require "rake/testtask"
 
-# Rake::TestTask.new(:test) do |t|
-#   t.libs << "test"
-#   t.libs << "lib"
-#   t.test_files = FileList['test/**/*_test.rb']
-# end
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/*_test.rb']
+end
 
-# task :default => :test
+task :default => :test

data/jarbs.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["hungerandthirst@gmail.com"]
 
   spec.summary       = %q{Jarbs: CLI Tooling for Lambda}
-  spec.description   = %q{Jarbs: They took em.}
+  spec.description   = %q{Jarbs: They took 'em.}
   spec.homepage      = "https://docs.articulate.zone/tools/jarbs.html"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -20,9 +20,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "commander"
   spec.add_dependency "aws-sdk", "~> 2"
   spec.add_dependency "rubyzip"
-  spec.add_dependency "rugged"
+  spec.add_dependency "crash-reporter"
+  spec.add_dependency "octokit"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "pry"
 end

data/lib/jarbs.rb

@@ -2,7 +2,12 @@ require 'rubygems'
 require 'fileutils'
 require 'commander'
 
+require 'crash_reporter'
+require 'crash_reporter/reporters/github_issues'
+
 require 'jarbs/version'
+require 'jarbs/config'
+require 'jarbs/github_auth'
 require 'jarbs/lambda'
 
 module Jarbs
@@ -11,6 +16,17 @@ module Jarbs
 
     GLOBAL_DEFAULTS = { env: 'dev' }
 
+    def initialize
+      @config = Config.new
+
+      if @config.get('crashes.report')
+        CrashReporter.configure do |c|
+          c.engines = [CrashReporter::GithubIssues.new('articulate/jarbs', @config.get('github.token'))]
+          c.version = Jarbs::VERSION
+        end
+      end
+    end
+
     def run
       program :version, Jarbs::VERSION
       program :description, 'Lambda Tooling'
@@ -20,27 +36,19 @@ module Jarbs
 
       command :new do |c|
         c.syntax = 'jarbs new [options] name'
-        c.summary = "Generate a new lambda function skeleton"
+        c.summary = "Generate a new lambda function or project skeleton"
         c.option "-f", "--force", "Force overwrite of existing function definition"
         c.action do |args, options|
           name = args.shift || abort("Must provide a lambda name")
           options.default GLOBAL_DEFAULTS
 
-          if Dir.exists? name
-            if options.force
-              FileUtils.rm_r name
-            else
-              abort("Function exists. Use the -f flag to force overwrite.")
-            end
-          end
+          lambda = Lambda.new(name, options)
 
-          # create project dir if doesn't exist yet
-          if !Dir.exists?('lambdas')
-            ProjectGenerator.new(name).generate
-            Dir.chdir name
-          end
+          project_exists?(name, remove: options.force)
+          lambda_exists?(lambda, remove: options.force)
 
-          Lambda.new(name, options).generate
+          generate_project(name) unless jarbs_project?
+          lambda.generate
         end
       end
 
@@ -52,7 +60,11 @@ module Jarbs
           name = args.shift || abort('Name argument required')
           options.default GLOBAL_DEFAULTS
 
-          Lambda.new(name, options).deploy
+          lambda = Lambda.new(name, options)
+
+          abort("Lambda '#{name}' does not exist.") unless lambda.exists?
+
+          lambda.deploy
         end
       end
 
@@ -60,7 +72,7 @@ module Jarbs
         c.syntax = 'jarbs rm NAME [NAME...]'
         c.summary = "Delete a lambda function"
         c.action do |args, options|
-          name = args.shift || abort('Name argument required')
+          abort('Name argument required') if args.empty?
           options.default GLOBAL_DEFAULTS
 
           begin
@@ -76,7 +88,58 @@ module Jarbs
         end
       end
 
+      command :ls do |c|
+        c.syntax = 'jarbs ls'
+        c.summary = "List lambda functions in this project"
+        c.action do |args, options|
+          lambdas = Dir.glob("lambdas/*").map {|x| Lambda.new(File.basename(x), options) }
+
+          lambdas.each do |l|
+            say "#{l.function.name}: #{l.function.description}"
+          end
+        end
+      end
+
       run!
     end
+
+    private
+
+    def project_exists?(name, remove: false)
+      if Dir.exists? name
+        if remove
+          FileUtils.rm_r name
+        else
+          abort("Project #{name} exists. Use the -f flag to force overwrite.")
+        end
+      end
+    end
+
+    def lambda_exists?(lambda, remove: false)
+      if lambda.function.exists?
+        if remove
+          lambda.function.remove!
+        else
+          abort("Function #{lambda.name} exists. Use the -f flag to force overwrite.")
+        end
+      end
+    end
+
+    def jarbs_project?
+      File.exists?('.jarbs')
+    end
+
+    def generate_project(name)
+      ProjectGenerator.new(name).generate
+
+      # run future commands in the new jarbs dir
+      Dir.chdir name
+
+      # create a config inside of the new project dir
+      config = Config.new
+      autolog = config.get('crashes.report') { agree("Would you like to log jarbs crashes to GitHub automatically (y/n)? ") }
+
+      GithubAuth.new(config).generate_token if autolog
+    end
   end
 end

data/lib/jarbs/config.rb

@@ -0,0 +1,40 @@
+module Jarbs
+  class Config
+    FILE_NAME = '.jarbs'
+
+    def initialize(file=FILE_NAME)
+      @file = file
+      @config = read
+    end
+
+    def set(key, value)
+      @config[key] = value
+      finalize
+    end
+
+    def get(key, &block)
+      val = @config[key]
+
+      if !val && block_given?
+        val = yield
+        set(key, val)
+      end
+
+      val
+    end
+
+    private
+
+    def finalize
+      File.open(@file, 'w') {|f| f.write JSON.pretty_generate(@config) }
+    end
+
+    def read
+      if File.exists? @file
+        JSON.parse(File.read(@file))
+      else
+        {}
+      end
+    end
+  end
+end

data/lib/jarbs/function_definition.rb

@@ -1,6 +1,11 @@
+require 'forwardable'
+
 module Jarbs
   class FunctionDefinition
+    extend Forwardable
+
     attr_reader :env, :name, :root_path
+    def_delegators :manifest, :description
 
     def initialize(name, env='dev')
       @env = env
@@ -8,8 +13,16 @@ module Jarbs
       @root_path = File.join('lambdas', name)
     end
 
+    def exists?
+      Dir.exists? root_path
+    end
+
+    def remove!
+      FileUtils.rm_r root_path
+    end
+
     def manifest
-      @manifest ||= JSON.parse File.read(manifest_file)
+      @manifest ||= OpenStruct.new JSON.parse(File.read(manifest_file))
     end
 
     def manifest_file

data/lib/jarbs/github_auth.rb

@@ -0,0 +1,22 @@
+require 'octokit'
+
+module Jarbs
+  class GithubAuth
+    include Commander::UI
+
+    def initialize(config)
+      @config = config
+      @client = Octokit::Client.new \
+        login: @config.get('github.username') { ask('GitHub username: ') },
+        password: password('Password (not saved): ')
+    end
+
+    def generate_token
+      resp = @client.create_authorization scopes: ['public_repo'],
+                                          note: 'Jarbs error reporting',
+                                          headers: { 'X-GitHub-OTP' => ask('GitHub two-factor token: ') }
+
+      @config.set('github.token', resp.token)
+    end
+  end
+end

data/lib/jarbs/lambda.rb

@@ -10,6 +10,9 @@ require 'jarbs/packager'
 module Jarbs
   class Lambda
     include Commander::UI
+    include CrashReporter::DSL
+
+    attr_accessor :function
 
     def initialize(name, options)
       @options = options
@@ -23,7 +26,7 @@ module Jarbs
     end
 
     def deploy
-      exists? ? update : create
+      deployed? ? update : create
     end
 
     def create
@@ -31,13 +34,16 @@ module Jarbs
       role = @options[:role] || ask("IAM role for function: ")
 
       say "Creating #{@function.env_name} on Lambda..."
-      @client.create_function function_name: @function.env_name,
-        runtime: 'nodejs',
-        handler: 'index.handler',
-        role: role,
-        memory_size: 128,
-        timeout: 10,
-        code: { zip_file: data }
+
+      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: data }
+      end
 
       say_ok "Complete!"
     end
@@ -46,7 +52,11 @@ module Jarbs
       data = prepare_for_aws
 
       say "Updating #{@function.env_name} on Lambda..."
-      @client.update_function_code function_name: @function.env_name, zip_file: data
+
+      capture_errors do
+        @client.update_function_code function_name: @function.env_name, zip_file: data
+      end
+
       say_ok "Complete!"
     end
 
@@ -59,12 +69,16 @@ module Jarbs
       @client.get_function(function_name: @function.env_name)
     end
 
-    def exists?
+    def deployed?
       true if info
     rescue Aws::Lambda::Errors::ResourceNotFoundException => e
       false
     end
 
+    def exists?
+      Dir.exists? function.source_path
+    end
+
     private
 
     def prepare_for_aws

data/lib/jarbs/manifest_helpers.rb

@@ -1,5 +1,3 @@
-require 'rugged'
-
 module Jarbs
   module ManifestHelpers
 
@@ -14,9 +12,7 @@ module Jarbs
     end
 
     def repo_url
-      Rugged::Repository.discover(".").remotes.first.url
-    rescue Rugged::RepositoryError => e
-      nil
+      @repo_url ||= `git config --get remote.origin.url`.chomp
     end
   end
 end

data/lib/jarbs/node_build.rb

@@ -1,13 +1,14 @@
 module Jarbs
   class NodeBuild
     include Commander::UI
+    include CrashReporter::DSL
 
     def initialize(function)
       @function = function
     end
 
     def npm_install(path, flags="")
-      run_in path, "npm install #{flags}"
+      capture_errors { run_in(path, "npm install #{flags}") }
     end
 
     def npm_build
@@ -15,9 +16,12 @@ module Jarbs
 
       # Copy source dir to build location and build in-place
       FileUtils.cp_r @function.source_path, @function.build_path
-      abortable_run "npm run build:function -- --out-dir #{@function.build_path} #{@function.source_path}"
 
-      npm_install @function.build_path, '--production'
+      capture_errors do
+        abortable_run "npm run build:function -- --out-dir #{@function.build_path} #{@function.source_path}"
+
+        npm_install @function.build_path, '--production'
+      end
     end
 
     def clean

data/lib/jarbs/project_generator.rb

@@ -1,14 +1,11 @@
 module Jarbs
   class ProjectGenerator
     include ManifestHelpers
-
     def initialize(name)
       @name = name
     end
 
     def generate
-      FileUtils.mkdir @name
-
       manifest = {
           name: @name,
           version: '0.0.0',
@@ -31,7 +28,9 @@ module Jarbs
           }
       }
 
+      FileUtils.mkdir @name
       write_package(manifest, @name)
+
       NodeBuild.new(nil).npm_install(@name)
     end
   end

data/lib/jarbs/version.rb

@@ -1,3 +1,3 @@
 module Jarbs
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jarbs
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Luke van der Hoeven
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rugged
+  name: crash-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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: pry
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 'Jarbs: They took em.'
+description: 'Jarbs: They took ''em.'
 email:
 - hungerandthirst@gmail.com
 executables:
@@ -119,6 +147,7 @@ files:
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - bin/console
@@ -126,9 +155,11 @@ files:
 - bin/setup
 - jarbs.gemspec
 - lib/jarbs.rb
+- lib/jarbs/config.rb
 - lib/jarbs/fixtures/index.js
 - lib/jarbs/function_definition.rb
 - lib/jarbs/function_generator.rb
+- lib/jarbs/github_auth.rb
 - lib/jarbs/lambda.rb
 - lib/jarbs/manifest_helpers.rb
 - lib/jarbs/node_build.rb
@@ -154,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: 'Jarbs: CLI Tooling for Lambda'