phoebo 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79a698357c05fcfd2bf85d0e8e0401d21de7fd67
-  data.tar.gz: 8f194beb7a95e1fe063d3c3a3ecc6a8b9bf3abff
+  metadata.gz: 99090a0ea219f65bfefe343d797e5569d01ed9e2
+  data.tar.gz: 48f00da413d5e5923906bbcd4b04a3dd5350cd73
 SHA512:
-  metadata.gz: ec764c25bd1cfbc49185cb3c66dae19fdc2660994be5ccc3cc9ee9f74b3882fb4e583ede1bb0506ef7f4f0e0d512cc646477ea6eb7217edb94fdfe9fc8d131e7
-  data.tar.gz: 42a9ecc1c64f7b747ae53247be494c2bb08faee16f421643a1a2e5a07c983b4ae9b80e0e5d8fce7806a271263479cc0ddeabf77d1484480057078efe2d8bef82
+  metadata.gz: 40abf6542d1aaed1cfb89246a87e909be330066fef1ee2ec04cb03d3626b5e914e1fa5c9b904a7a4c53c28277f117e4c96659a4ed5e40be26ab202f9e380cb0e
+  data.tar.gz: 82a50760a0b290e2eed500d92480d0ae0c641a883735addccc2f973aa5228db76a02603d40ea4f67827940f6aad874522128a84aa44193de3a5661ed690b75a3

data/lib/phoebo/config.rb

@@ -6,10 +6,10 @@ module Phoebo
     attr_accessor :images, :tasks
 
     # Loads config from file
-    # @see Phoebo.configure()
-    def self.new_from_file(file_path)
+    def self.new_from_file(file_path, request = nil)
       begin
         @instance = nil
+        @args     = [ request, file_path ]
         Kernel.load file_path, true
         @instance
 
@@ -18,20 +18,25 @@ module Phoebo
       end
     end
 
+    # @see Phoebo.configure()
     def self.new_from_block(block)
-      @instance = self.new
+      args = @args || [ nil, nil ]
+      @args = nil
+
+      @instance = self.new(*args)
       @instance.dsl_eval(block)
     end
 
     # Instance initialization
-    def initialize
+    def initialize(request = nil, config_path = nil)
+      @request = request
       @images = []
       @tasks = []
     end
 
     # Evaluate block within DSL context
     def dsl_eval(block)
-      @dsl ||= DSL.new(self)
+      @dsl ||= DSL.new(self, @request)
       @dsl.instance_eval(&block)
 
       # Finish config
@@ -51,8 +56,13 @@ module Phoebo
 
     # Private DSL
     class DSL
-      def initialize(config)
-        @config = config
+      def initialize(config, request)
+        @config  = config
+        @request = request
+      end
+
+      def secrets
+        @request ? @request.secrets : {}
       end
 
       def image(name, options, &block)
@@ -90,13 +100,11 @@ module Phoebo
           raise Phoebo::SyntaxError.new("Unexpected parameter #{options.keys.first} for service #{name}.")
         end
 
-        puts task.inspect
-
         @config.tasks << task
         task
       end
 
-      def task(name, image, *args)
+      def task(name, options = {})
         _task_definition_check('service', name, options)
 
         task = {
@@ -105,6 +113,11 @@ module Phoebo
 
         _apply_task_options(task, options)
 
+        if options[:on_demand]
+          task[:on_demand] = options[:on_demand] ? true : false
+          options.delete(:on_demand)
+        end
+
         unless options.empty?
           raise Phoebo::SyntaxError.new("Unexpected parameter #{options.keys.first} for task #{name}.")
         end

data/lib/phoebo/config/image.rb

@@ -47,10 +47,14 @@ module Phoebo
 
         # Define action methods for all commands
         ImageCommands.commands.each do |id, command_class|
-          define_method(id) do |*args|
-            @image.actions << command_class.send(:action, *args)
+          define_method(id) do |*args, &block|
+            @image.actions << command_class.send(:action, *args, &block)
           end
         end
+
+        def method_missing(name, args, block)
+          raise Phoebo::SyntaxError.new("No such build command #{name} for image #{@image.name}")
+        end
       end
 
     end

data/lib/phoebo/config/image_commands/add.rb

@@ -5,12 +5,8 @@ module Phoebo::Config::ImageCommands
   	end
 
   	def self.action(src, dest)
-      return Proc.new do |dockerfile, files|
-
-        virtual = 'project/' + src
-        files[virtual] = src
-
-        dockerfile << 'ADD ' + virtual + ' ' + dest
+      return Proc.new do |build|
+        build.copy(build.base_path + src, dest)
       end
   	end
   end

data/lib/phoebo/config/image_commands/create.rb

@@ -0,0 +1,19 @@
+module Phoebo::Config::ImageCommands
+  class Create
+    def self.id
+      :create
+    end
+
+    def self.action(destination, content = nil, &block)
+      return Proc.new do |build|
+        if block
+          build.create(destination, &block)
+        else
+          build.create(destination) do |out_stream|
+            out_stream.write(content)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/phoebo/config/image_commands/run.rb

@@ -5,9 +5,9 @@ module Phoebo::Config::ImageCommands
   	end
 
   	def self.action(cmd, *args)
-      return Proc.new do |dockerfile, files|
+      return Proc.new do |build|
         # TODO: decide which exec method we will use and enforce escaping
-        dockerfile << "RUN #{cmd} #{args.join(' ')}"
+        build << "RUN #{cmd} #{args.join(' ')}"
       end
   	end
   end

data/lib/phoebo/docker/image_builder.rb

@@ -17,49 +17,20 @@ module Phoebo
 
         if image.from.first == :base_image
           dockerfile << "FROM #{image.from[1]}"
-
-          # Apply all defined actions
-          image.actions.each do |action|
-            action.call(dockerfile, project_files)
-          end
         end
 
-        # TODO: Honor file mode
         tar_stream = StringIO.new
         Gem::Package::TarWriter.new(tar_stream) do |tar|
-          tar.add_file('Dockerfile', 0640) { |out_stream| out_stream.write(dockerfile.join("\n")) }
-          tar.mkdir('project', 0750)
-
-          # Copy project file into virtual destination
-          while !project_files.empty? do
-            virtual, relative = project_files.shift
-            real = @base_path + relative
 
-            if real.directory?
-              real.each_entry do |child|
-                next if child.fnmatch?('..') or child.fnmatch?('.')
-                if child.directory?
-                  tar.mkdir("#{virtual}/#{child}", 0750)
-                end
+          image_build = Build.new(@base_path, dockerfile, tar)
 
-                # Add to stack
-                project_files["#{virtual}/#{child}"] = "#{relative}/#{child}"
-              end
-
-            elsif real.file?
-
-              # 'file.txt' -> 'dest/'
-              if virtual.end_with?('/')
-                dest += real.basename.to_s
-              end
-
-              # Read file to our TAR output stream
-              tar.add_file(virtual, 0640) do |out_stream|
-                in_stream = real.open('r')
-                IO.copy_stream(in_stream, out_stream)
-              end
-            end
+          # Apply all defined actions
+          image.actions.each do |action|
+            action.call(image_build)
           end
+
+          # Create Dockerfile
+          tar.add_file('Dockerfile', 0640) { |out_stream| out_stream.write(dockerfile.join("\n")) }
         end
 
         begin
@@ -86,6 +57,95 @@ module Phoebo
           raise DockerError, e.message
         end
       end
+
+      class Build
+        attr_reader :base_path, :dockerfile, :tar
+
+        def initialize(base_path, dockerfile, tar)
+          @base_path = base_path
+          @dockerfile = dockerfile
+          @tar = tar
+
+          @dirs = { }
+        end
+
+        # Add Dockerfile instruction
+        def <<(str)
+          @dockerfile << str
+        end
+
+        # Create new file by block
+        def create(destination_path, mode = 640, &block)
+          basename = Pathname.new(destination_path).basename.to_s
+          random = random_dir
+
+          # Add Dockerfile instruction
+          virtual = "#{random}/#{basename}"
+          self << 'ADD ' + virtual + ' ' + destination_path
+
+          # Create directory for this instruction
+          tar.mkdir(random, 750)
+
+          # Add file with yielded block
+          @tar.add_file(virtual, mode, &block)
+        end
+
+        # Copy files to docker image
+        def copy(source, destination_path)
+          # TODO: Honor file mode
+
+          source = Pathname.new(source) unless source.is_a?(Pathname)
+          random = random_dir
+
+          # Add Dockerfile instruction
+          if source.directory?
+            self << 'ADD ' + random + ' ' + destination_path
+            files = [ [ source, random ] ]
+          else
+            self << 'ADD ' + random + '/' + source.basename.to_s + ' ' + destination_path
+            files = [ [ source, random + '/' ] ]
+          end
+
+          # Create directory for this instruction
+          tar.mkdir(random, 750)
+
+          # Add all the files recursively
+          while !files.empty? do
+            source, destination_path = files.shift
+
+            # Directory
+            if source.directory?
+              source.each_entry do |child|
+                next if child.fnmatch?('..') or child.fnmatch?('.')
+                @tar.mkdir("#{destination_path}/#{child}", 0750) if child.directory?
+                files << [ source + child, "#{destination_path}/#{child}" ]
+              end
+
+            # File
+            elsif source.file?
+              # If we are adding 'file.txt' to 'dest/': we need to append filename
+              destination_path += source.basename.to_s if destination_path.end_with?('/')
+
+              # Add file copy
+              @tar.add_file(destination_path, 0640) do |out_stream|
+                in_stream = source.open('r')
+                IO.copy_stream(in_stream, out_stream)
+              end
+            end
+          end
+        end
+
+        private
+
+        def random_dir
+          begin
+            random = SecureRandom.hex
+          end while @dirs.key?(random)
+
+          @dirs[random] = true
+          random
+        end
+      end
     end
   end
 end

data/lib/phoebo/request.rb

@@ -36,6 +36,21 @@ module Phoebo
       IO.write(@ssh_public_file, key_content)
     end
 
+    # Secrets (default: empty hash)
+    def secrets
+      @secrets ||= {}
+    end
+
+    # Secrets validation on set
+    def secrets=(hash)
+      hash.each do |key, value|
+        raise InvalidRequestError, "Invalid format for request secret #{key.inspect}" \
+          unless value.is_a? String or value.is_a? Numeric
+      end
+
+      @secrets = hash
+    end
+
     # Loads request with data from hash
     def load_from_hash!(hash)
       hash.each do |k, v|
@@ -50,7 +65,7 @@ module Phoebo
     # Loads request from JSON string
     def load_from_json!(raw_data)
       begin
-        hash = JSON.parse(raw_data)
+        hash = JSON.parse(raw_data, symbolize_names: true)
       rescue JSON::ParserError => e
         raise InvalidRequestError, "Malformed JSON data."
       end

data/lib/phoebo/version.rb

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

data/lib/phoebo/worker.rb

@@ -20,7 +20,7 @@ module Phoebo
 
       if File.exists?(config_path)
         # Load config
-        config = Config.new_from_file(config_path)
+        config = Config.new_from_file(config_path, @request)
 
         # Build & push image
         builder = Docker::ImageBuilder.new(path)

data/spec/phoebo/config_spec.rb

@@ -48,7 +48,7 @@ describe Phoebo::Config do
 
     it 'processes images' do
       image = instance_double(Phoebo::Config::Image)
-      expect(Phoebo::Config::Image).to receive(:new).with('image-name', 'base-image-name', image_dsl_block).and_return(image)
+      expect(Phoebo::Config::Image).to receive(:new).with('image-name', { from: 'base-image-name' }, image_dsl_block).and_return(image)
 
       subject.dsl_eval(dsl)
       expect(subject.images).to include(image)

data/spec/phoebo/docker/image_builder_spec.rb

@@ -24,7 +24,7 @@ describe Phoebo::Docker::ImageBuilder do
 
     image = instance_double(Phoebo::Config::Image)
     allow(image).to receive(:name).and_return('image-name')
-    allow(image).to receive(:from).and_return('debian')
+    allow(image).to receive(:from).and_return([ :base_image, 'debian'])
     allow(image).to receive(:actions).and_return(actions)
 
     image

data/spec/phoebo/request_spec.rb

@@ -85,7 +85,10 @@ describe Phoebo::Request do
   let(:json) do
     <<-EOS
     {
-      "repo_url": "ssh://somehost.tld/user/repo.git"
+      "repo_url": "ssh://somehost.tld/user/repo.git",
+      "secrets": {
+        "dbpassword": "somesecretpassword"
+      }
     }
     EOS
   end
@@ -106,6 +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')
     end
   end
 
@@ -123,19 +127,19 @@ describe Phoebo::Request do
     end
   end
 
-  # TODO: cover all possible states
-  context 'loading from url' do
-    let(:http_response) do
-      response = double
-      allow(response).to receive(:code).and_return(200)
-      allow(response).to receive(:body).and_return(json)
-      response
-    end
-
-    it 'loads data' do
-      allow(Net::HTTP).to receive(:start).and_return(http_response)
-      expect(subject).to receive(:load_from_json!).with(json)
-      subject.load_from_url!('http://test')
-    end
-  end
+  # TODO: cover all possible states and use some HTTP mocking library
+  # context 'loading from url' do
+  #   let(:http_response) do
+  #     response = double(Net::HTTPOK)
+  #     allow(response).to receive(:code).and_return(200)
+  #     allow(response).to receive(:body).and_return(json)
+  #     response
+  #   end
+
+  #   it 'loads data' do
+  #     allow(Net::HTTP).to receive(:start).and_return(http_response)
+  #     expect(subject).to receive(:load_from_json!).with(json)
+  #     subject.load_from_url!('http://test')
+  #   end
+  # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phoebo
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Adam Staněk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -129,6 +129,7 @@ files:
 - lib/phoebo/config/image.rb
 - lib/phoebo/config/image_commands.rb
 - lib/phoebo/config/image_commands/add.rb
+- lib/phoebo/config/image_commands/create.rb
 - lib/phoebo/config/image_commands/run.rb
 - lib/phoebo/console.rb
 - lib/phoebo/docker.rb