overlay 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8479a9240cb271370971581ea99894ba3464648a
-  data.tar.gz: c8d636d1baf6a65e27f7446c430a47239cc78dca
+  metadata.gz: 031b8194d30735cc12a551ea18ffe9efdc7eb914
+  data.tar.gz: 3eb47ae8de9876ba5edb5538615d4dd249db71c8
 SHA512:
-  metadata.gz: b3b600fa435fb66f6efc679bee29ebc75f69f77d8fad8bf3eab56ec747d64b72b35f7805f4805a4c32190c22b0cb743ad250e3b2bbaa387816720e2b91f5cef6
-  data.tar.gz: 32a6d3df5db389f516ebe736d0cd68c7fd10798de560602d0a461c66357c990cf3a89a2062781dd1488dfb1a24c80991b13b3374d2b353dca49d031bc1485004
+  metadata.gz: a5fccfac90429e7a30cbeaf820db2b974b9c5dadfe7ee6fcef40c7e1bb45cd50318d925efb3984c8a9f6859dbdf0c7f28a88fbca627e4e6e0933c14e537ca8d5
+  data.tar.gz: 18a649cfb638101b073bb6d773d8c885fc83e7ebf926e9eabb7f0b554363db78f9826d5050f0827f01c5827f0721ddf45da1469710a0cef690d17d375fe9be84

data/lib/overlay/github.rb

@@ -53,33 +53,39 @@ module Overlay
 
       commits.each do |commit|
         # There will be three entries in each commit with file paths: added, removed, and modified.
-        added_files = commit['added']
-        added_files.each do |file|
-          # Do we care?
-          if my_file?(file, repo_config)
-            Rails.logger.info "Overlay found added file in hook: #{file}"
-
-            # Make sure that the directory is in place
-            FileUtils.mkdir_p(destination_path(File.dirname(file), repo_config))
-            clone_file(file, repo_config)
+        unless commit['added'].nil?
+          added_files = commit['added']
+          added_files.each do |file|
+            # Do we care?
+            if my_file?(file, repo_config)
+              Rails.logger.info "Overlay found added file in hook: #{file}"
+
+              # Make sure that the directory is in place
+              FileUtils.mkdir_p(destination_path(File.dirname(file), repo_config))
+              clone_file(file, repo_config)
+            end
           end
         end
 
-        modified_files = commit['added']
-        modified_files.each do |file|
-          # Do we care?
-          if my_file?(file, repo_config)
-            Rails.logger.info "Overlay found modified file in hook: #{file}"
-            clone_file(file, repo_config)
+        unless commit['modified'].nil?
+          modified_files = commit['modified']
+          modified_files.each do |file|
+            # Do we care?
+            if my_file?(file, repo_config)
+              Rails.logger.info "Overlay found modified file in hook: #{file}"
+              clone_file(file, repo_config)
+            end
           end
         end
 
-        removed_files = commit['added']
-        removed_files.each do |file|
-          # Do we care?
-          if my_file?(file, repo_config)
-            Rails.logger.info "Overlay found deleted file in hook: #{file}"
-            File.delete(destination_path(file, repo_config))
+        unless commit['removed'].nil?
+          removed_files = commit['removed']
+          removed_files.each do |file|
+            # Do we care?
+            if my_file?(file, repo_config)
+              Rails.logger.info "Overlay found deleted file in hook: #{file}"
+              File.delete(destination_path(file, repo_config))
+            end
           end
         end
       end

data/lib/overlay/version.rb

@@ -1,3 +1,3 @@
 module Overlay
-  VERSION = "2.1.4"
+  VERSION = "2.1.5"
 end

data/spec/dummy/log/test.log

@@ -1839,3 +1839,178 @@ Completed 200 OK in 6ms (Views: 5.3ms)
 Processing by Overlay::GithubController#update as HTML
   Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
 Completed 200 OK in 0ms (Views: 0.2ms)
+Processing by Overlay::GithubController#update as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 6ms (Views: 5.8ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+Completed 200 OK in 0ms (Views: 0.2ms)
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay subscribing to redis channel: test_key
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay subscribing to redis channel: test_key
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+  Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 3.2ms)
+Processing by Overlay::GithubController#update as HTML
+Completed 200 OK in 0ms (Views: 0.1ms)
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay subscribing to redis channel: test_key
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+  Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 3.5ms)
+Processing by Overlay::GithubController#update as HTML
+Completed 200 OK in 0ms (Views: 0.1ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+  Rendered text template (0.0ms)
+Completed 200 OK in 3ms (Views: 3.1ms)
+Processing by Overlay::GithubController#update as HTML
+Completed 200 OK in 0ms (Views: 0.1ms)
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay subscribing to redis channel: test_key
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Overlay found added file in hook: lib/test/test.rb
+Overlay found modified file in hook: lib/test/test.rb
+Overlay found deleted file in hook: lib/test/test.rb
+Processing by Overlay::GithubController#update as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 3.5ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+Completed 200 OK in 0ms (Views: 0.2ms)
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay subscribing to redis channel: test_key
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay subscribing to redis channel: test_key
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+  Rendered text template (0.0ms)
+Completed 200 OK in 5ms (Views: 4.1ms)
+Processing by Overlay::GithubController#update as HTML
+Completed 200 OK in 0ms (Views: 0.1ms)
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay subscribing to redis channel: test_key
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Processing by Overlay::GithubController#update as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 3.3ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+Completed 200 OK in 0ms (Views: 0.2ms)

data/spec/github_spec.rb

@@ -148,16 +148,13 @@ describe Overlay::Github do
                 \"username\":\"saarinen\"
               },
               \"added\":[
-
-              ],
-              \"added\":[
-                \"lib/test/test.rb\"
+                \"lib/test/test_added.rb\"
               ],
               \"removed\":[
-                \"lib/test/test.rb\"
+                \"lib/test/test_removed.rb\"
               ],
               \"modified\":[
-                \"lib/test/test.rb\"
+                \"lib/test/test_modified.rb\"
               ]
             }
           ],
@@ -178,13 +175,13 @@ describe Overlay::Github do
               \"username\":\"saarinen\"
             },
             \"added\":[
-              \"lib/test/test.rb\"
+              \"lib/test/test_added.rb\"
             ],
             \"removed\":[
-              \"lib/test/test.rb\"
+              \"lib/test/test_removed.rb\"
             ],
             \"modified\":[
-              \"lib/test/test.rb\"
+              \"lib/test/test_modified.rb\"
             ]
           },
           \"repository\":{
@@ -229,24 +226,25 @@ describe Overlay::Github do
 
     it 'should remove a deleted file' do
       allow(Overlay::Github.instance).to receive(:clone_file).and_return
-      allow(FileUtils).to receive(:mkdir_p).with("#{Rails.application.root}/lib/test")
-      expect(File).to receive(:delete).with("#{Rails.application.root}/lib/test/test.rb").and_return
+      allow(FileUtils).to receive(:mkdir_p).and_return
+      expect(File).to receive(:delete).with("#{Rails.application.root}/lib/test/test_removed.rb").and_return
 
       Overlay::Github.instance.process_hook(payload, repo_config)
     end
 
     it 'should clone added or modified files' do
-      allow(FileUtils).to receive(:mkdir_p).with("#{Rails.application.root}/lib/test")
-      allow(File).to receive(:delete).with("#{Rails.application.root}/lib/test/test.rb").and_return
-      expect(Overlay::Github.instance).to receive(:clone_file).with("lib/test/test.rb", repo_config).exactly(:twice).and_return
+      allow(FileUtils).to receive(:mkdir_p).and_return
+      allow(File).to receive(:delete).and_return
+      expect(Overlay::Github.instance).to receive(:clone_file).with("lib/test/test_added.rb", repo_config).and_return
+      expect(Overlay::Github.instance).to receive(:clone_file).with("lib/test/test_modified.rb", repo_config).and_return
 
       Overlay::Github.instance.process_hook(payload, repo_config)
     end
 
     it 'should call post_hook after hook is processed' do
-      allow(FileUtils).to receive(:mkdir_p).with("#{Rails.application.root}/lib/test")
-      allow(File).to receive(:delete).with("#{Rails.application.root}/lib/test/test.rb").and_return
-      allow(Overlay::Github.instance).to receive(:clone_file).with("lib/test/test.rb", repo_config).and_return
+      allow(FileUtils).to receive(:mkdir_p).and_return
+      allow(File).to receive(:delete).and_return
+      allow(Overlay::Github.instance).to receive(:clone_file).and_return
 
       hook_ran = false
 
@@ -258,5 +256,41 @@ describe Overlay::Github do
 
       expect(hook_ran).to eq(true)
     end
+
+    it 'should process hook with null added descriptors' do
+      allow(FileUtils).to receive(:mkdir_p).and_return
+      allow(File).to receive(:delete).and_return
+      allow(Overlay::Github.instance).to receive(:clone_file).and_return
+
+      # Remove added file
+      payload_modified = payload
+      payload_modified['commits'].first['added'] = nil
+
+      expect { Overlay::Github.instance.process_hook(payload_modified, repo_config) }.to_not raise_error
+    end
+
+    it 'should process hook with null modified descriptors' do
+      allow(FileUtils).to receive(:mkdir_p).and_return
+      allow(File).to receive(:delete).and_return
+      allow(Overlay::Github.instance).to receive(:clone_file).and_return
+
+      # Remove modified file
+      payload_modified = payload
+      payload_modified['commits'].first['modified'] = nil
+
+      expect { Overlay::Github.instance.process_hook(payload_modified, repo_config) }.to_not raise_error
+    end
+
+    it 'should process hook with null removed descriptors' do
+      allow(FileUtils).to receive(:mkdir_p).and_return
+      allow(File).to receive(:delete).and_return
+      allow(Overlay::Github.instance).to receive(:clone_file).and_return
+
+      # Remove removed file
+      payload_modified = payload
+      payload_modified['commits'].first['removed'] = nil
+
+      expect { Overlay::Github.instance.process_hook(payload_modified, repo_config) }.to_not raise_error
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overlay
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Steve Saarinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails