lambchop 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dea62c77a6ac1568c61714754f3f6b1f43b875d4
-  data.tar.gz: 7a2be55dbe9adbbe746c3cc53dbe9418cd8a1609
+  metadata.gz: d80c6e0852ad9d7a44e2743493bf9e8e53b30019
+  data.tar.gz: ce1a1e09d9368b679fa06cceae088ccd31735cac
 SHA512:
-  metadata.gz: 464363eb0712671e815688fb67853102cdee49a4615c2c9a52607b4636463f8267b47a88316ad8e341bffb3ce49eddd66cdfcc0427c03dbd5c47f8199a33b505
-  data.tar.gz: 6d912182b4202f0bc7fa1720f36403eb84b7170f16e33a94d5e01e6db6dd09e1b6b33eb0df1baae728a7d1f07f3aa5b832871cec301bb0af2272686f10e131c6
+  metadata.gz: eefc0526e495af489968d9056c12b4c833b443bc2abd61b1ac8d10644610d29d954ce135d5850fdd71aad3f7b939110dc500635a0182f3468d22249a4c9f66b0
+  data.tar.gz: 0b72a2732f81fb0162ecb87b360fc4cffbedbbdf00398c8ab85a8ecd8bacb5a23e5da3675f0f250dcec6185deff0e3f4ea15bf5bd1dad5ae563aef835da92b32

data/README.md

@@ -35,6 +35,8 @@ timeout: 3          # default: 3
 memory_size: 128    # default: 128
 role: arn:aws:iam::NNNNNNNNNNNN:role/lambda_exec_role
 handler: test.handler
+# Handler module name is filename.
+# `handler:` is `index.handler` when filename is `index.js`
 */
 console.log('Loading event');
 
@@ -122,6 +124,29 @@ START RequestId: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
 └── node_modules/
 ```
 
+# Diff
+```sh
+$ lambchop-diff
+usage: lambchop-cat <function-name> <file>
+
+$ lambchop-diff test ./test.js
+--- test:test.js
++++ ./test.js
+@@ -1,11 +1,11 @@
+ var http = require('http');
+
+ exports.handler = function(event, context) {
+-  http.get('http://example.com/', function(res) {
++  http.get('http://www.yahoo.com/', function(res) {
+     res.setEncoding('utf8');
+     res.on('data', function(str) {
+       console.log(str);
+       context.done();
+     });
+   });
+ };
+```
+
 ## Demo
 
 * https://asciinema.org/a/14158

data/bin/lambchop-diff

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+$: << File.expand_path("#{File.dirname __FILE__}/../lib")
+require 'rubygems'
+require 'lambchop'
+
+if ARGV.length != 2
+  puts 'usage: lambchop-cat <function-name> <file>'
+  exit 1
+end
+
+open(ARGV[1]) do |f|
+  Lambchop::Diff.diff(ARGV[0], f)
+end

data/lambchop.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'aws-sdk-core', '~> 2.0.9'
   spec.add_dependency 'rubyzip', '>= 1.0.0'
+  spec.add_dependency 'diffy'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 end

data/lib/lambchop.rb

@@ -3,13 +3,16 @@ require 'open-uri'
 require 'yaml'
 
 require 'aws-sdk-core'
+require 'diffy'
 require 'zip'
 
 module Lambchop; end
 
 require 'lambchop/cat'
 require 'lambchop/client'
+require 'lambchop/diff'
 require 'lambchop/dump'
 require 'lambchop/tail'
+require 'lambchop/utils'
 require 'lambchop/watch_dog'
 require 'lambchop/version'

data/lib/lambchop/client.rb

@@ -11,8 +11,8 @@ class Lambchop::Client
   end
 
   def start
-    src = remove_shebang(@source)
-    config, src = parse_magic_comment(src)
+    src = Lambchop::Utils.remove_shebang(@source)
+    config, src = Lambchop::Utils.parse_magic_comment(src)
 
     config['function_name'] ||= File.basename(@path, '.js')
     function_name = config['function_name']
@@ -60,24 +60,4 @@ class Lambchop::Client
       end
     end
   end
-
-  def remove_shebang(src)
-    src.sub(/\A#![^\n]*\n/, '')
-  end
-
-  def parse_magic_comment(src)
-    ss = StringScanner.new(src)
-
-    unless ss.scan(%r|\A\s*/\*|)
-      raise 'Cannot find magic comment'
-    end
-
-    unless comment = ss.scan_until(%r|\*/|)
-      raise 'Cannot find magic comment'
-    end
-
-    comment.sub!(%r|\*/\z|, '')
-
-    [YAML.load(comment), ss.rest.sub(/\A\n/, '')]
-  end
 end

data/lib/lambchop/diff.rb

@@ -0,0 +1,33 @@
+class Lambchop::Diff
+  def self.diff(function_name, file, options = {})
+    self.new(function_name, file, options).diff
+  end
+
+  def initialize(function_name, file, options = {})
+    @function_name = function_name
+    @file          = file
+    @client        = options[:client] || Aws::Lambda::Client.new
+    @out           = options[:out] || $stdout
+    @options       = options
+  end
+
+  def diff
+    file = @file
+
+    if file.kind_of?(IO)
+      file = file.read
+    end
+
+    file = Lambchop::Utils.remove_shebang(file)
+    config, file = Lambchop::Utils.parse_magic_comment(file)
+
+    page = @client.get_function(:function_name => @function_name).first
+
+    Lambchop::Utils.open_source(page.code.location) do |name, func|
+      @out.puts("--- #{@function_name}:#{name}")
+      @out.puts("+++ #{@file.path}")
+      diff = Diffy::Diff.new(func, file, :include_diff_info => true).to_s
+      @out.puts(diff.each_line.to_a.slice(2..-1).join)
+    end
+  end
+end

data/lib/lambchop/dump.rb

@@ -42,12 +42,9 @@ class Lambchop::Dump
   end
 
   def puts_source(location)
-    open(location) do |f|
-      Zip::InputStream.open(f) do |zis|
-        while entry = zis.get_next_entry
-          @out.puts(entry.get_input_stream.read)
-        end
-      end
+    Lambchop::Utils.open_source(location) do |name, src|
+      @out.puts("// #{name}")
+      @out.puts(src)
     end
   end
 end

data/lib/lambchop/utils.rb

@@ -0,0 +1,34 @@
+class Lambchop::Utils
+  class << self
+    def remove_shebang(src)
+      src.sub(/\A#![^\n]*\n/, '')
+    end
+
+    def parse_magic_comment(src)
+      ss = StringScanner.new(src)
+
+      unless ss.scan(%r|\A\s*/\*|)
+        raise 'Cannot find magic comment'
+      end
+
+      unless comment = ss.scan_until(%r|\*/|)
+        raise 'Cannot find magic comment'
+      end
+
+      comment.sub!(%r|\*/\z|, '')
+
+      [YAML.load(comment), ss.rest.sub(/\A\n/, '')]
+    end
+
+    def open_source(location)
+      open(location) do |f|
+        Zip::InputStream.open(f) do |zis|
+          while entry = zis.get_next_entry
+            next if entry.name =~ %r|\Anode_modules/|
+            yield(entry.name, entry.get_input_stream.read)
+          end
+        end
+      end
+    end
+  end # of class methods
+end

data/lib/lambchop/version.rb

@@ -1,3 +1,3 @@
 module Lambchop
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lambchop
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Genki Sugawara
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: diffy
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +87,7 @@ email:
 executables:
 - lambchop
 - lambchop-cat
+- lambchop-diff
 - lambchop-dump
 - lambchop-tail
 extensions: []
@@ -85,14 +100,17 @@ files:
 - Rakefile
 - bin/lambchop
 - bin/lambchop-cat
+- bin/lambchop-diff
 - bin/lambchop-dump
 - bin/lambchop-tail
 - lambchop.gemspec
 - lib/lambchop.rb
 - lib/lambchop/cat.rb
 - lib/lambchop/client.rb
+- lib/lambchop/diff.rb
 - lib/lambchop/dump.rb
 - lib/lambchop/tail.rb
+- lib/lambchop/utils.rb
 - lib/lambchop/version.rb
 - lib/lambchop/watch_dog.rb
 homepage: https://github.com/winebarrel/lambchop