gurney_client 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64bb60a1de5168633f0f1fd0605030edffe46440472dfdf64bbb56862f40f3d4
-  data.tar.gz: 3a95353020d09220c0dd989c59f8d4ff84579b2da7795a2fef630e5ca42d688e
+  metadata.gz: bb46098ee5a2a49bdccf9bb4d5db373b2ce5847ae1398f30fe2a676a9d732b07
+  data.tar.gz: 78b5b151888f590897f8869ae6d30788b4d4398ff122ef63525fd4048cb1bbd0
 SHA512:
-  metadata.gz: 1967532e08ba47400be443ce8bdbd65b1690fc6dc75d1f35d6e5121dcd02b5948ff97c870cd60395c5b83288c432bc25db2f1bb9732286cb6e3da629ca2139a0
-  data.tar.gz: b44ded67b9c21e227ba567722ca27546319590b6c5c895d2b1950455704ac45f34a843402b003f7618af348f298483cf861887697ec7cd8023f95ddbfeb0d349
+  metadata.gz: 0e1bf0ed5a79b112999cd347f383de248a2fbb5ff0c85a0ef1250e19bafde7b089f6e94b04b19d1c39f17791b6db0cf452bceb03b2d43e2d60beb4cc940305ec
+  data.tar.gz: c007024b0dc4197d983c66ba8182f7847fb04b4af8650cc6597f30f5fee5f89f7cd3e0bf16d92bfa47af276edb0dfcf2545752d61370498887b63cfa66c917f0

data/Gemfile

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'colorize'
-gem 'httparty'
+gemspec
+
 gem 'rspec'
 gem 'byebug'
-gem 'bundler'
-gem 'git'

data/Gemfile.lock

@@ -1,3 +1,12 @@
+PATH
+  remote: .
+  specs:
+    gurney_client (0.1.6)
+      bundler (< 3)
+      colorize (~> 0.8)
+      git (~> 1.5)
+      httparty (~> 0.17.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -30,11 +39,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
   byebug
-  colorize
-  git
-  httparty
+  gurney_client!
   rspec
 
 BUNDLED WITH

data/README.md

@@ -17,6 +17,8 @@ Usage: gurney [options]
                                      Token to be send to the api in the X-AuthToken header
     -c, --config [CONFIG FILE]       Config file to use
     -h, --hook                       Run as a git post-receive hook
+        --client-hook
+                                     Run as a git pre-push hook
     -p, --project-id [PROJECT ID]    Specify project id for api
         --help
                                      Prints this help

data/lib/gurney/cli.rb

@@ -4,12 +4,12 @@ require 'colorize'
 require 'open3'
 require 'git'
 require 'fileutils'
-require 'byebug'
 
 module Gurney
   class CLI
 
     HOOK_STDIN_REGEX = /(?<old>[0-9a-f]{40}) (?<new>[0-9a-f]{40}) refs\/heads\/(?<ref>\w+)/m
+    CLIENT_HOOK_STDIN_REGEX = /refs\/heads\/(?<ref>\w+) (?<new>[0-9a-f]{40}) refs\/heads\/(?<remote_ref>\w+) (?<remote_sha>[0-9a-f]{40})/m
 
     def self.run(cmd_parameter=[])
       options = Gurney::CLI::OptionParser.parse(cmd_parameter)
@@ -31,6 +31,7 @@ module Gurney
         config_file ||= '---'
         config = Gurney::Config.from_yaml(config_file)
 
+        options.branches ||= config&.branches
         options.branches ||= config&.branches
         options.api_token ||= config&.api_token
         options.api_url ||= config&.api_url
@@ -41,11 +42,12 @@ module Gurney
         end
 
         branches = []
-        if options.hook
+        if options.hook || options.client_hook
           # we get passed changed branches and refs via stdin
           $stdin.each_line do |line|
-            matches = line.match(HOOK_STDIN_REGEX)
-            unless matches[:new] == '0' * 40
+            regex = options.client_hook ? CLIENT_HOOK_STDIN_REGEX : HOOK_STDIN_REGEX
+            matches = line.match(regex)
+            if matches && matches[:new] != '0' * 40
               if options.branches.include? matches[:ref]
                 branches << matches[:ref]
               end
@@ -63,10 +65,10 @@ module Gurney
         branches.each do |branch|
           dependencies = []
 
-          yarn_source = Gurney::Source::Yarn.new(yarn_lock: read_file(g, options.hook, branch, 'yarn.lock'))
+          yarn_source = Gurney::Source::Yarn.new(yarn_lock: read_file(g, options.hook || options.client_hook, branch, 'yarn.lock'))
           dependencies.concat yarn_source.dependencies || []
 
-          bundler_source = Gurney::Source::Bundler.new(gemfile_lock: read_file(g, options.hook, branch, 'Gemfile.lock'))
+          bundler_source = Gurney::Source::Bundler.new(gemfile_lock: read_file(g, options.hook || options.client_hook, branch, 'Gemfile.lock'))
           dependencies.concat bundler_source.dependencies || []
 
           dependencies.compact!
@@ -87,7 +89,7 @@ module Gurney
         puts e.message.red
       rescue Exception => e
         puts "Gurney: an unexpected error occurred".red
-        puts "#{e.full_message}"
+        raise
       end
     end
 
@@ -95,8 +97,10 @@ module Gurney
 
     def self.read_file(git, from_git, branch, filename)
       if from_git
-        if git.ls_tree(branch)['blob'].key?(filename)
-          return git.show("#{branch}:#{filename}")
+        begin
+          git.show("#{branch}:#{filename}")
+        rescue Git::GitExecuteError
+          # happens if branch does not exist
         end
       else
         if File.exists? filename

data/lib/gurney/cli/option_parser.rb

@@ -8,6 +8,7 @@ module Gurney
       def self.parse(args)
         options = OpenStruct.new
         options.hook = false
+        options.client_hook = false
         options.config_file = 'gurney.yml'
 
         option_parser = ::OptionParser.new do |opts|
@@ -20,7 +21,7 @@ module Gurney
             options.api_url = api_url
           end
 
-          opts.on('', '--api-token [API TOKEN]', 'Token to be send to api in the X-AuthToken header') do |api_token|
+          opts.on('', '--api-token [API TOKEN]', 'Token to be send to the api in the X-AuthToken header') do |api_token|
             options.api_token = api_token
           end
 
@@ -32,6 +33,10 @@ module Gurney
             options.hook = hook
           end
 
+          opts.on('', '--client-hook', 'Run as a git pre-push hook') do |client_hook|
+            options.client_hook = client_hook
+          end
+
           opts.on('-p', '--project-id [PROJECT ID]', 'Specify project id for api') do |project_id|
             options.project_id = project_id
           end

data/lib/gurney/version.rb

@@ -1,3 +1,3 @@
 module Gurney
-  VERSION = "0.1.1"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gurney_client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Martin Schaflitzl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-18 00:00:00.000000000 Z
+date: 2019-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize