cyclid 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52003b67cb59f27d6ef7bea410f715d6b8714c33
-  data.tar.gz: 08e3f06342e7ac69bc8917dd17d47c1ba72aec65
+  metadata.gz: eff5a90aeccc36b649701ec2ec970f4dc1c11e9d
+  data.tar.gz: 103987b807c2b04930a68d96787d64cb3864b359
 SHA512:
-  metadata.gz: 400fc554727abcbdfcdd65ca57005ea912e7b725d6568d972cdcb07f0c9bea30c4c90feee27660f00f9fa9d54cb607d9d471f3895c4433593cef1174526dbd34
-  data.tar.gz: 172919cb2f58442730393e9c6c6cce91423c25dabeeec13641925304374d84ed55fd6c9247895cc0b05be85cef3286c5f84edb031b52111c2d6bc62b5d1901a5
+  metadata.gz: 802e3bce3fdd10e988997c282f635dda5cb81715bf6e0c6755bfc32ef1ef5491a424caa8d0cd1b03fee9befe18a5cd825e5ad053725b726070322e5d03dc19f4
+  data.tar.gz: 2562e60cf0591decaba4bb01ac515072695b3834cfd3c18c6589794655ea9cf0451d575bbbc006ae3f160d5a9e2fc6504ad2fa2b7c209fe528d9e54943518fda

data/app/cyclid/controllers/organizations/job.rb

@@ -233,6 +233,8 @@ module Cyclid
             hash = {}
             hash[:job_id] = job_record.id
             hash[:status] = job_record.status
+            hash[:started] = job_record.started if job_record.started
+            hash[:ended] = job_record.ended if job_record.ended
 
             return hash.to_json
           end

data/app/cyclid/job/runner.rb

@@ -237,13 +237,22 @@ module Cyclid
         # Find and create a suitable source plugin instance for each source and have it check out
         # the given source using the transport.
         def checkout_sources(transport, ctx, sources)
+          # Group each entry by type
+          groups = {}
           sources.each do |job_source|
             raise 'no type given in source definition' unless job_source.key? :type
 
-            source = Cyclid.plugins.find(job_source[:type], Cyclid::API::Plugins::Source)
-            raise "can't find a plugin for #{job_source[:type]} source" if source.nil?
+            type = job_source[:type]
+            groups[type] = [] unless groups.key? type
+            groups[type] << job_source
+          end
+
+          # Find the appropriate plugin for each type and pass it the list of repositories
+          groups.each do |group, group_sources|
+            plugin = Cyclid.plugins.find(group, Cyclid::API::Plugins::Source)
+            raise "can't find a plugin for #{group} source" if plugin.nil?
 
-            success = source.new.checkout(transport, ctx, job_source)
+            success = plugin.new.checkout(transport, ctx, group_sources)
             raise 'failed to check out source' unless success
           end
         end

data/app/cyclid/plugins/source.rb

@@ -28,7 +28,7 @@ module Cyclid
 
         # Process the source to produce a copy of the remote code in a
         # directory in the working directory
-        def checkout(_transport, _ctx, _source = {})
+        def checkout(_transport, _ctx, _sources = [])
           false
         end
       end

data/app/cyclid/plugins/source/git.rb

@@ -23,41 +23,100 @@ module Cyclid
       class Git < Source
         # Run commands via. the transport to check out a given Git remote
         # repository
-        def checkout(transport, ctx, source = {})
-          source.symbolize_keys!
+        def checkout(transport, ctx, sources = [])
+          normalized_sources = normalize_and_dedup(sources)
+          normalized_sources.each do |source|
+            source.symbolize_keys!
 
-          raise 'invalid git source definition' \
-            unless source.key? :url
+            raise 'invalid git source definition' \
+              unless source.key? :url
 
-          # Add any context data (which could include secrets)
-          source = source.interpolate(ctx)
+            # Add any context data (which could include secrets)
+            source = source.interpolate(ctx)
 
-          url = URI(source[:url])
+            url = URI(source[:url])
 
-          # If the source includes an OAuth token, add it to the URL as the
-          # username
-          url.user = source[:token] if source.key? :token
+            # If the source includes an OAuth token, add it to the URL as the
+            # username
+            url.user = source[:token] if source.key? :token
 
-          success = transport.exec "git clone #{url}"
-          return false unless success
+            success = transport.exec "git clone #{url}"
+            return false unless success
+
+            # If a branch was given, check it out
+            next unless source.key? :branch
 
-          # If a branch was given, check it out
-          if source.key? :branch
             branch = source[:branch]
 
             match = url.path.match(%r{^.*\/(\w*)})
             source_dir = "#{ctx[:workspace]}/#{match[1]}"
 
             success = transport.exec("git fetch origin #{branch}:#{branch}", source_dir)
-            success = transport.exec("git checkout #{branch}", source_dir) \
-              unless success == false
+            return false unless success
+
+            success = transport.exec("git checkout #{branch}", source_dir)
+            return false unless success
           end
 
-          return success
+          return true
         end
 
         # Register this plugin
         register_plugin 'git'
+
+        private
+
+        # Remove any duplicate source definitions:
+        #
+        # 1. Normalize the source URLs
+        # 2. Find all of the definitions for a given URL and merge them
+        def normalize_and_dedup(sources)
+          normalized_sources = normalize(sources)
+          Cyclid.logger.debug "normalized_sources=#{normalized_sources}"
+          deduped_sources = dedup(normalized_sources)
+          Cyclid.logger.debug("deduped_sources=#{deduped_sources}")
+
+          return deduped_sources
+        end
+
+        # Standardise the Git URLs. Git urls can be of the form:
+        #
+        # git://github.com/user/project.git#commit-ish
+        # git+ssh://user@hostname:project.git#commit-ish
+        # git+ssh://user@hostname/project.git#commit-ish
+        # git+http://user@hostname/project/blah.git#commit-ish
+        # git+https://user@hostname/project/blah.git#commit-ish
+        #
+        # 1. We won't support SSH; HTTP(s) only
+        # 2. Extract the user and treat it as the token parameter
+        # 3. Extract the fragment and treat it as the branch parameter
+        #
+        # So:
+        #
+        # http[s]://[user@]hostname/project/blah.git[#commit-ish]
+        #
+        def normalize(sources)
+          normalized = sources.map do |source|
+            uri = URI.parse(source[:url])
+            next unless uri.scheme =~ /\Ahttps?\z/
+
+            s = {}
+            s[:url] = "#{uri.scheme}://#{uri.host}#{uri.path.gsub(/.git$/, '')}"
+            s[:token] = uri.user if uri.user
+            s[:branch] = uri.fragment if uri.fragment
+            source.merge(s)
+          end
+          normalized.compact
+        end
+
+        # Merge any duplicate source definitions
+        def dedup(sources)
+          merged = sources.map do |source|
+            all = sources.select { |el| el[:url] == source[:url] }
+            all.inject(&:merge)
+          end
+          merged.uniq
+        end
       end
     end
   end

data/app/db.rb

@@ -19,20 +19,20 @@ require 'logger'
 begin
   case ENV['RACK_ENV']
   when 'development'
-    database = if defined? Cyclid
-                 Cyclid.config.database
-               else
+    database = if defined? Rake
                  'sqlite3:development.db'
+               else
+                 Cyclid.config.database
                end
 
     ActiveRecord::Base.establish_connection(
       database
     )
 
-    ActiveRecord::Base.logger = if defined? Cyclid
-                                  Cyclid.logger
-                                else
+    ActiveRecord::Base.logger = if defined? Rake
                                   Logger.new(STDERR)
+                                else
+                                  Cyclid.logger
                                 end
   when 'production'
     ActiveRecord::Base.establish_connection(

data/lib/cyclid/version.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+module Cyclid
+  module Api
+    VERSION = '0.2.1'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyclid
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kristian Van Der Vliet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -380,6 +380,7 @@ files:
 - bin/cyclid-db-init
 - db/schema.rb
 - lib/cyclid/app.rb
+- lib/cyclid/version.rb
 homepage: https://cyclid.io
 licenses:
 - Apache-2.0