gurney_client 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd2a78a937d235e5721e25358a1a5315d8dc850ec8056cde282edff5d1355fc5
-  data.tar.gz: 699f3357aa10f1027b8fbdea0bf685b7631035b9ffdce3492f97b467e5d244d8
+  metadata.gz: 3a6cb4778c8a278c1d91a6eb42c2757b841f830742f760e289d140ca0a8fa67a
+  data.tar.gz: 995c92b582f0b49baa15042fadbc0bec9a3b3c2013ec0610a7f268785de60655
 SHA512:
-  metadata.gz: e345a8404c7d0572f4938a73d5a1ee698f428f49921a6aa21ad7f88a11f160fa82106eadf053f681562dbe8c5ff6dd154c5e78ff2645b807e0b8a0bb4685a290
-  data.tar.gz: 33aa810ef802d3f983834a0d365029b04322b77645285bbc142501743dd74e967786229c809aae475967d11d2a4146c459d901b9b66f73419affa69e46d4d6d6
+  metadata.gz: 5dd8b763b8ba1e0a79edaad6bca1ab43b40dc54cfbb1a16648dc020d5ffd2067d529fef5903144c54c12d3ca7018cf540b58ea34ea86e5d9c4a201fd8ee35db6
+  data.tar.gz: 3c910d5fb6ce83e570bd267bcb4a31399c18096f0839090b611f5d3bb8049a58fb29930cd8319acc8e07a837d7355dedac248fa3f8f09cea785d8288734ffed7

data/Gemfile

@@ -4,3 +4,4 @@ gemspec
 
 gem 'rspec'
 gem 'byebug'
+gem 'rake'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gurney_client (0.1.3)
+    gurney_client (0.2.1)
       bundler (< 3)
       colorize (~> 0.8)
       git (~> 1.5)
@@ -13,14 +13,17 @@ GEM
     byebug (11.0.1)
     colorize (0.8.1)
     diff-lcs (1.3)
-    git (1.5.0)
-    httparty (0.17.1)
+    git (1.7.0)
+      rchardet (~> 1.8)
+    httparty (0.17.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    mime-types (3.3)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2020.0512)
     multi_xml (0.6.0)
+    rake (13.0.1)
+    rchardet (1.8.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -41,7 +44,8 @@ PLATFORMS
 DEPENDENCIES
   byebug
   gurney_client!
+  rake
   rspec
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

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.rb

@@ -4,6 +4,7 @@ require_relative 'gurney/dependency'
 require_relative 'gurney/source/base'
 require_relative 'gurney/source/yarn'
 require_relative 'gurney/source/bundler'
+require_relative 'gurney/source/ruby_version'
 require_relative 'gurney/api'
 require_relative 'gurney/cli/option_parser'
 require_relative 'gurney/cli'

data/lib/gurney/cli.rb

@@ -9,13 +9,14 @@ 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)
 
       begin
         if options.hook
-          g = Git.bare(ENV['GIT_DIR'])
+          g = Git.bare(ENV['GIT_DIR'] || Dir.pwd)
         else
           unless Dir.exists? './.git'
             raise Gurney::Error.new('Must be run within a git repository')
@@ -30,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
@@ -40,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
@@ -62,12 +65,15 @@ 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 || []
 
+          ruby_version_source = Gurney::Source::RubyVersion.new(ruby_version: read_file(g, options.hook || options.client_hook, branch, '.ruby-version'))
+          dependencies.concat ruby_version_source.dependencies || []
+
           dependencies.compact!
 
           api = Gurney::Api.new(base_url: options.api_url, token: options.api_token)
@@ -94,8 +100,10 @@ module Gurney
 
     def self.read_file(git, from_git, branch, filename)
       if from_git
-        if git.branches[branch] && 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/source/ruby_version.rb

@@ -0,0 +1,27 @@
+require 'bundler'
+
+module Gurney
+  module Source
+    class RubyVersion < Base
+
+    def initialize(ruby_version:)
+      @ruby_version = ruby_version&.strip
+    end
+
+    def present?
+      @ruby_version && @ruby_version.size > 0
+    end
+
+    def dependencies
+      if present?
+        [Dependency.new(ecosystem: 'ruby', name: 'ruby', version: @ruby_version)]
+      end
+    end
+
+    private
+
+    attr_reader :gemfile_lock
+
+    end
+  end
+end

data/lib/gurney/version.rb

@@ -1,3 +1,3 @@
 module Gurney
-  VERSION = "0.1.3"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gurney_client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Martin Schaflitzl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -94,6 +94,7 @@ files:
 - lib/gurney/dependency.rb
 - lib/gurney/source/base.rb
 - lib/gurney/source/bundler.rb
+- lib/gurney/source/ruby_version.rb
 - lib/gurney/source/yarn.rb
 - lib/gurney/version.rb
 homepage: https://github.com/makandra/gurney
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Gurney is a small tool to extract yarn and RubyGems dependencies from project