phoebo 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1159f6b4ba303529fbe552e822f78a0d43ec8f6c
-  data.tar.gz: 5940d0895d8897b306e1b806c45e1eb573863bdf
+  metadata.gz: 79a698357c05fcfd2bf85d0e8e0401d21de7fd67
+  data.tar.gz: 8f194beb7a95e1fe063d3c3a3ecc6a8b9bf3abff
 SHA512:
-  metadata.gz: 8220b523589768f32fcd361ea791bca14ca1fb0520a6c06aee3fb5b107cbdc5758119f20085ba3bd3c013d25ba2ac82b149b895c37e8c625a102877db7b57a68
-  data.tar.gz: 72193bf2ba0c96d3f108198cd29993f31b00aa6abbf103438b1a0f44993baec52a17a2473e121e9e9e9f272d32c6f7c2c5d62c062f0e6f2e2dd3b2d0cdac6ff5
+  metadata.gz: ec764c25bd1cfbc49185cb3c66dae19fdc2660994be5ccc3cc9ee9f74b3882fb4e583ede1bb0506ef7f4f0e0d512cc646477ea6eb7217edb94fdfe9fc8d131e7
+  data.tar.gz: 42a9ecc1c64f7b747ae53247be494c2bb08faee16f421643a1a2e5a07c983b4ae9b80e0e5d8fce7806a271263479cc0ddeabf77d1484480057078efe2d8bef82

data/lib/phoebo/config.rb

@@ -33,6 +33,19 @@ module Phoebo
     def dsl_eval(block)
       @dsl ||= DSL.new(self)
       @dsl.instance_eval(&block)
+
+      # Finish config
+      @tasks.each do |task|
+        unless task[:image]
+          if @images.size == 1
+            task[:image] = @images.first.name
+          else
+            id = task[:service] ? "service #{task[:name]}" : "task #{task[:name]}"
+            raise Phoebo::SyntaxError.new("You need to define image for #{id}.")
+          end
+        end
+      end
+
       self
     end
 
@@ -42,22 +55,93 @@ module Phoebo
         @config = config
       end
 
-      def image(name, from, &block)
-        @config.images << (img_instance = Image.new(name, from, block))
+      def image(name, options, &block)
+        @config.images << (img_instance = Image.new(name, options, block))
         img_instance
       end
 
+      def service(name, options = {})
+        _task_definition_check('service', name, options)
+
+        task = {
+          name: name.to_s,
+          service: true
+        }
+
+        _apply_task_options(task, options)
+
+        if options[:ports]
+          if options[:ports].is_a?(Array)
+            task[:ports] = options[:ports].collect do |port_def|
+              if port_def.is_a?(Hash) && port_def.size == 1
+                { port_def.keys.first.to_sym => port_def.values.first.to_i }
+              else
+                raise Phoebo::SyntaxError.new("Expected port definition in form { tcp: 1234 } for service #{name}")
+              end
+            end
+          else
+            raise Phoebo::SyntaxError.new("Expected Array for ports definition of service #{name}.")
+          end
+
+          options.delete(:ports)
+        end
+
+        unless options.empty?
+          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)
+        _task_definition_check('service', name, options)
+
         task = {
-          name: name,
-          image: image
+          name: name.to_s
         }
 
-        task[:cmd] = args unless args.empty?
+        _apply_task_options(task, options)
+
+        unless options.empty?
+          raise Phoebo::SyntaxError.new("Unexpected parameter #{options.keys.first} for task #{name}.")
+        end
+
         @config.tasks << task
         task
       end
-    end
 
+      private
+
+      def _task_definition_check(subject, name, options)
+        raise Phoebo::SyntaxError.new("Name required for #{subject} definition.") if name.to_s.empty?
+        raise Phoebo::SyntaxError.new("Unexpected block for #{subject} #{name}.") if block_given?
+        raise Phoebo::SyntaxError.new("Unexpected parameters for #{subject} #{name}. Expected Hash.") unless options.is_a?(Hash)
+      end
+
+      def _apply_task_options(task, options)
+        if options[:image]
+          task[:image] = options[:image].to_s
+          options.delete(:image)
+        end
+
+        if options[:command]
+          task[:command] = options[:command].to_s
+          options.delete(:command)
+        end
+
+        if options[:arguments]
+          if options[:arguments].is_a?(Array)
+            task[:arguments] = options[:arguments].collect { |item| item.to_s }
+          else
+            task[:arguments] = [ options[:arguments].to_s ]
+          end
+
+          options.delete(:arguments)
+        end
+      end
+    end
   end
 end

data/lib/phoebo/config/image.rb

@@ -3,10 +3,32 @@ module Phoebo
     class Image
       attr_accessor :actions, :name, :from
 
-      def initialize(name, from, block = nil)
+      def initialize(name, options, block = nil)
         @actions = []
         @name = name
-        @from = from
+
+        if options.is_a?(Hash)
+
+          # image('my-image', from: 'base-image')
+          if options[:from]
+            @from = [ :image, options[:from] ]
+            raise Phoebo::SyntaxError.new('You can only use from: or from_dockerfile: directive as a base for your images.') if options[:from_dockerfile]
+
+          # image('my-image', from_dockerfile: 'Dockerfile')
+          elsif
+            @from = [ :dockerfile, options[:from_dockerfile] ]
+            raise Phoebo::SyntaxError.new('Building from Dockerfile is not supported yet.')
+          end
+
+        # Support for image('my-image', 'base-image')
+        else
+          @from = [ :base_image, options ]
+        end
+
+        unless @from
+          raise Phoebo::SyntaxError.new('You need to specify base for your image (use from: or from_dockerfile:).')
+        end
+
         dsl_eval(block) if block
       end
 

data/lib/phoebo/docker/image_builder.rb

@@ -14,11 +14,14 @@ module Phoebo
       def build(image)
         project_files = { }
         dockerfile = []
-        dockerfile << "FROM #{image.from}"
 
-        # Apply all defined actions
-        image.actions.each do |action|
-          action.call(dockerfile, project_files)
+        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

data/lib/phoebo/version.rb

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

data/spec/phoebo/config_spec.rb

@@ -42,7 +42,7 @@ describe Phoebo::Config do
     let(:dsl) {
       child_block = image_dsl_block
       Proc.new {
-        image('image-name', 'base-image-name', &child_block)
+        image('image-name', from: 'base-image-name', &child_block)
       }
     }
 

metadata

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