ciquantum 0.0.18 → 0.0.19

data/lib/ciquantum/adapter/gitlab.rb

@@ -22,9 +22,13 @@ module CIQuantum
         return config[command]
       end
 
-      def commit_from_request request
-        hash = JSON.parse request.body.read.strip
-        return (hash["repository"]["name"] == config.project) ? hash["after"] : nil
+      def commit_from_request body
+        begin
+          hash = JSON.parse body
+          return (hash["repository"]["name"] == config.project) ? hash["after"] : nil
+        rescue
+          nil
+        end
       end
 
     end

data/lib/ciquantum/adapter/unfuddle.rb

@@ -23,10 +23,9 @@ module CIQuantum
         return config[command]
       end
 
-      def commit_from_request request
+      def commit_from_request body
         begin
-          xml = request.body.read
-          return Changeset.new(xml).commit
+          return Changeset.new(body).commit
         rescue Unfuddle::ChangesetError => e
           nil
         end

data/lib/ciquantum/git.rb

@@ -51,6 +51,7 @@ module CIQuantum
     end
 
     def current_branch_contains_commit? commit_sha
+      return false if commit_sha.nil? || commit_sha.empty?
       branches_with_commit(commit_sha).include?(branch)
     end
 

data/lib/ciquantum/server.rb

@@ -82,8 +82,9 @@ module CIQuantum
     end
 
     post '/push' do
-      puts "Request received on push:\n#{request.body.read}"
-      commit = quantum.adapter.commit_from_request request
+      str = request.body.read.strip
+      puts "Request received on push:\n#{str}"
+      commit = quantum.adapter.commit_from_request str
       if quantum.git.current_branch_contains_commit? commit
         quantum.build
       end

data/lib/ciquantum/version.rb

@@ -1,3 +1,3 @@
 module CIQuantum
-  Version = VERSION = "0.0.18"
+  Version = VERSION = "0.0.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ciquantum
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler