cyclid 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 051d2d610dc0eb351961625c4b7803648425b8e3
-  data.tar.gz: f318c016a0c6e3de32faea08f8cb4ac046c781ea
+  metadata.gz: 075e82b45f23bff6cb7e99792eb97e3d7a55e912
+  data.tar.gz: 2ccbb21e53f9db060786e22d641a05203c18d420
 SHA512:
-  metadata.gz: 2b8cbf10d103bc69384c92eb32b9cb48944f6debe6bcbf2a1c37f0bcdd710c97f2077c82371373e6d57d30b15df487d0fbdd18ec9df60252335af21e0996a951
-  data.tar.gz: 3a518369356ca89ed5a5ab340779493ec7dd1862a4822735c596366063a9f70fd8e81934dd6a725d78e93d7c5c91e6e05d1171b792d7c7f2db715c2dd1a43228
+  metadata.gz: e3bcc3a37f8c1bd4b83d90ed61af1bee3482d94b05b60c0966bb05f7fa433a618671d4450ab94890ffeb4fa5bd5b0c672af133067aae5dc68d3d7d0f01893501
+  data.tar.gz: 35cfcb20a3434bd9e0ff492c00017e64288b51cda48662417b61807e7cf4584f0cba83201592ad648f48a259c71776b55bbc3aff432f8321170dff0e134e4e7f

data/app/cyclid/plugins/api/github/helpers.rb

@@ -29,14 +29,14 @@ module Cyclid
               @pr ||= @payload['pull_request']
             end
 
-            def pr_clone_url
-              pull_request['base']['repo']['html_url']
-            end
-
             def pr_head
               @pr_head ||= pull_request['head']
             end
 
+            def pr_clone_url
+              pr_head['repo']['html_url']
+            end
+
             def pr_sha
               pr_head['sha']
             end

data/app/cyclid/plugins/provisioner/debian.rb

@@ -25,6 +25,10 @@ module Cyclid
         def prepare(transport, buildhost, env = {})
           transport.export_env('DEBIAN_FRONTEND' => 'noninteractive')
 
+          # Build hosts may require an update before anything can be installed
+          success = transport.exec 'apt-get update'
+          raise 'failed to update repositories' unless success
+
           if env.key? :repos
             env[:repos].each do |repo|
               next unless repo.key? :url
@@ -39,6 +43,7 @@ module Cyclid
               end
             end
 
+            # We must update again to cache the new repositories
             success = transport.exec 'apt-get update'
             raise 'failed to update repositories' unless success
           end

data/app/cyclid/plugins/provisioner/ubuntu.rb

@@ -25,6 +25,10 @@ module Cyclid
         def prepare(transport, buildhost, env = {})
           transport.export_env('DEBIAN_FRONTEND' => 'noninteractive')
 
+          # Build hosts may require an update before anything can be installed
+          success = transport.exec 'apt-get update'
+          raise 'failed to update repositories' unless success
+
           if env.key? :repos
             # Ensure apt-get-repository is available
             transport.exec 'apt-get install -y software-properties-common'
@@ -45,6 +49,7 @@ module Cyclid
               end
             end
 
+            # We must update again to cache the new repositories
             success = transport.exec 'apt-get update'
             raise 'failed to update repositories' unless success
           end

data/app/cyclid/plugins/transport/ssh.rb

@@ -122,17 +122,11 @@ module Cyclid
 
         # Close the SSH connection
         def close
-          logout
-
           @session.close
         end
 
         private
 
-        def logout
-          exec 'exit'
-        end
-
         def build_command(cmd, path = nil, env = {})
           command = []
           if env

data/bin/cyclid-db-init

@@ -59,9 +59,10 @@ def generate_password
         %w($ % ^ & * _)).sample(8).join
 end
 
-def create_admin_user
-  secret = SecureRandom.hex(32)
-  password = generate_password
+def create_admin_user(initial_secret, initial_password)
+  secret = initial_secret || SecureRandom.hex(32)
+  password = initial_password || generate_password
+
   user = User.new
   user.username = 'admin'
   user.email = 'admin@example.com'
@@ -97,7 +98,10 @@ def update_user_perms
   permissions.save!
 end
 
-secret, password = create_admin_user
+initial_secret = ARGV[0]
+initial_password = ARGV[1]
+
+secret, password = create_admin_user(initial_secret, initial_password)
 create_admin_organization
 
 update_user_perms

data/lib/cyclid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyclid
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Kristian Van Der Vliet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj