phoebo 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99090a0ea219f65bfefe343d797e5569d01ed9e2
-  data.tar.gz: 48f00da413d5e5923906bbcd4b04a3dd5350cd73
+  metadata.gz: 417f2a5ace199d80b2fd0184e296115d0433b28b
+  data.tar.gz: a48472fdc0dc01693c9011b05434eb8925d7b7c6
 SHA512:
-  metadata.gz: 40abf6542d1aaed1cfb89246a87e909be330066fef1ee2ec04cb03d3626b5e914e1fa5c9b904a7a4c53c28277f117e4c96659a4ed5e40be26ab202f9e380cb0e
-  data.tar.gz: 82a50760a0b290e2eed500d92480d0ae0c641a883735addccc2f973aa5228db76a02603d40ea4f67827940f6aad874522128a84aa44193de3a5661ed690b75a3
+  metadata.gz: c40fdee73ef2bde227405b0b0036278d3ededbb5fc6a2e6a998dd7c6ad5b6d3ddacd205c9ae44bb0e63b13a9edf80e187379112dc706dc4f4e53c7b9f45bb844
+  data.tar.gz: f29199721c935ec9c0566f7d54af0e3f7a8dcaae712a77097fc14b609933ee752557e5ebad7690cb6f5e9651bab82ff9d4e4a7aea76a9b6a66549346788bfa20

data/lib/phoebo/config.rb

@@ -61,8 +61,8 @@ module Phoebo
         @request = request
       end
 
-      def secrets
-        @request ? @request.secrets : {}
+      def params
+        @request ? @request.params : {}
       end
 
       def image(name, options, &block)

data/lib/phoebo/docker/image_builder.rb

@@ -7,8 +7,9 @@ module Phoebo
     class ImageBuilder
       include Console
 
-      def initialize(base_path)
+      def initialize(base_path, request)
         @base_path = Pathname.new(base_path)
+        @request = request
       end
 
       def build(image)
@@ -47,8 +48,9 @@ module Phoebo
           stdout.print " virtual size: " + ('%.2f MB' % (built_image.json['VirtualSize'].to_f / 1000 / 1000)).cyan
           stdout.puts
 
-          stdout.puts "Tagging image #{built_image.id.to_s.cyan} -> #{image.name.cyan}"
-          built_image.tag('repo' => image.name, 'force' => true)
+          tag = @request.ref ? @request.ref[0...8] : 'latest'
+          stdout.puts "Tagging image #{built_image.id.to_s.cyan} -> #{image.name.cyan}#{':'.cyan}#{tag.cyan}"
+          built_image.tag('repo' => image.name, 'tag' => tag, 'force' => true)
 
           # Return image ID
           built_image.id

data/lib/phoebo/git.rb

@@ -16,9 +16,21 @@ module Phoebo
 
       # Clone remote repository
       begin
-        Rugged::Repository.clone_at request.repo_url,
+        repo = Rugged::Repository.clone_at request.repo_url,
           clone_path, credentials: cred
 
+        if request.ref
+          if request.ref =~ /^[0-9a-f]+$/i
+            if repo.exists?(request.ref.downcase)
+              repo.checkout(request.ref.downcase, strategy: :force)
+            else
+              raise IOError, "Unable to find commit #{request.ref}. Git checkout failed."
+            end
+          else
+            raise IOError, "Invalid commit reference #{request.ref}. Git checkout failed."
+          end
+        end
+
       rescue Rugged::SshError => e
         raise unless e.message.include?('auth')
         raise IOError, "Unable to clone remote repository. SSH authentication failed."

data/lib/phoebo/request.rb

@@ -8,7 +8,8 @@ module Phoebo
   # input from multiple sources (HTTP request, CLI options) and provides data
   # validation with human-readable error messages.
   class Request
-    attr_accessor :repo_url, :ssh_user, :ssh_private_file, :ssh_public_file
+    attr_accessor :repo_url, :ref
+    attr_accessor :ssh_user, :ssh_private_file, :ssh_public_file
     attr_accessor :docker_user, :docker_password, :docker_email
     attr_accessor :id, :ping_url
     attr_writer :temp_file_manager
@@ -36,19 +37,19 @@ module Phoebo
       IO.write(@ssh_public_file, key_content)
     end
 
-    # Secrets (default: empty hash)
-    def secrets
-      @secrets ||= {}
+    # Params (default: empty hash)
+    def params
+      @params ||= {}
     end
 
-    # Secrets validation on set
-    def secrets=(hash)
+    # Params validation on set
+    def params=(hash)
       hash.each do |key, value|
-        raise InvalidRequestError, "Invalid format for request secret #{key.inspect}" \
+        raise InvalidRequestError, "Invalid format for request parameter #{key.inspect}" \
           unless value.is_a? String or value.is_a? Numeric
       end
 
-      @secrets = hash
+      @params = hash
     end
 
     # Loads request with data from hash

data/lib/phoebo/version.rb

@@ -1,3 +1,3 @@
 module Phoebo
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/phoebo/worker.rb

@@ -23,7 +23,7 @@ module Phoebo
         config = Config.new_from_file(config_path, @request)
 
         # Build & push image
-        builder = Docker::ImageBuilder.new(path)
+        builder = Docker::ImageBuilder.new(path, @request)
         config.images.each do |image|
           image_id = builder.build(image)
           pusher.push(image_id) if @request.docker_user

data/spec/phoebo/request_spec.rb

@@ -86,7 +86,7 @@ describe Phoebo::Request do
     <<-EOS
     {
       "repo_url": "ssh://somehost.tld/user/repo.git",
-      "secrets": {
+      "params": {
         "dbpassword": "somesecretpassword"
       }
     }
@@ -109,7 +109,7 @@ describe Phoebo::Request do
     it 'applies arguments' do
       subject.load_from_json!(json)
       expect(subject.repo_url).to eql('ssh://somehost.tld/user/repo.git')
-      expect(subject.secrets[:dbpassword]).to eql('somesecretpassword')
+      expect(subject.params[:dbpassword]).to eql('somesecretpassword')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phoebo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Adam Staněk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize