ludwig 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b60bb41e36584ba8aac79780e599d4e9bea3249
-  data.tar.gz: 8863a356d1a716d4f85fed2b303025ec06cd99ea
+  metadata.gz: 08cbeeb28adc2c14fff362d279c6b0c171b6558e
+  data.tar.gz: bc8bd272d8e319b3ecaedb2d56698fb19bb19db0
 SHA512:
-  metadata.gz: 170c200fdabfcd32cae8d1afa9bb82083f2eb3c03f3cd007b867e2d8e82ec0161b501e9cf326f44f758076cd45877d297cc56818bda0ee6f10c59eba08c17bec
-  data.tar.gz: 83224d7dc22c138b0178c683eb5bda14cdd4eea9bc425b377c768c5a0b4a70c90393fcd290aa83c8339c36e2a4f9f40bbeefd520daccd20d1ff393cec6c26170
+  metadata.gz: bcbb49bef423ec620cf3db17e999e2765210cc844d73511232b0647eae3fe98af94943f83199d3c77c2f9c31c71b502ac62606c575e0e764ea4421b392f37cde
+  data.tar.gz: 5e65e62e116101a295553a1503a4d718a0f90e993672f9f22d05688c6962c54a2a5669169aea28876ac6a2328a7c7740addde51a9e72803825faff9103f2327d

data/lib/ludwig/cli.rb

@@ -13,20 +13,20 @@ module Ludwig
       global_option('-d', '--debug', 'Enable debug mode') { $debug = true }
       global_option('-c', '--config filename', String, 'Set config filename') { |config_file| @config_file = config_file }
 
-      command :up do |c|
-        c.syntax = 'ludwig up [options]'
-        c.summary = 'Generate docker-compose.yml and launch docker-compose'
+      command :compose do |c|
+        c.syntax = 'ludwig compose [options]'
+        c.summary = 'Generate docker-compose.yml'
         c.action do |args, options|
           generate_compose_file
-          system 'docker-compose up'
         end
       end
 
-      command :build do |c|
-        c.syntax = 'ludwig build [options]'
-        c.summary = 'Generate docker-compose.yml'
+      command :up do |c|
+        c.syntax = 'ludwig up [options]'
+        c.summary = 'Generate docker-compose.yml and launch docker-compose'
         c.action do |args, options|
           generate_compose_file
+          system 'docker-compose up'
         end
       end
 

data/lib/ludwig/service.rb

@@ -1,44 +1,37 @@
 module Ludwig
-  class Service < Struct.new(:project, :name, :data, :config)
-    ACTION_MAP = {
-      volumes:  :volumes_action,
-      links:    :links_action,
-      env_file: :prefix_path,
-      build:    :prefix_path
-    }
-
+  Service = Struct.new(:project, :name, :data, :config) do
     def generate_yaml
-      new_data = data.each_with_object({}) do |(key, value), memo|
-        memo[key] = execute_action(key, value)
-      end
+      transform_data
+      merge_extra_links
+      new_data
+    end
+
+    private
 
+    def merge_extra_links
       if extra_links = config["extra_links"][name]
         new_data["links"] ||= []
         new_data["links"] += extra_links.map do |app|
           "#{sanitize(app)}_#{config["default_app"]}:#{sanitize(app)}"
         end
       end
+    end
 
-      new_data
+    def new_data
+      @new_data ||= {}
     end
 
-    def execute_action(key, obj)
-      action = ACTION_MAP[key.to_sym]
-      action ? send(action, obj) : obj
+    def sanitize(input)
+      input.gsub(/-/, "_")
     end
 
-    def volumes_action(volumes)
-      volumes.map do |volume|
-        local, remote = volume.split(":")
-        if local =~ /^\.\/?/
-          "#{prefix_path(local)}:#{remote}"
-        else
-          volume
-        end
+    def transform_data
+      data.each do |key, value|
+        new_data[key] = try("transform_#{key}", value) || value
       end
     end
 
-    def links_action(links)
+    def transform_links(links)
       links.map do |link|
         link_name, link_alias = link.split(":")
         link_alias = link_name if link_alias.nil?
@@ -46,12 +39,26 @@ module Ludwig
       end
     end
 
-    def prefix_path(path)
+    def transform_path(path)
       "../#{project}/#{path}"
     end
+    alias_method :transform_build,    :transform_path
+    alias_method :transform_env_file, :transform_path
 
-    def sanitize(input)
-      input.gsub(/-/, "_")
+    def transform_ports(ports)
+      return ports if config['expose_ports'][name]
+      ports.map { |port| port.to_s.split(':').last }
+    end
+
+    def transform_volumes(volumes)
+      volumes.map do |volume|
+        local, remote = volume.split(":")
+        local =~ /^\.\/?/ ? "#{transform_path(local)}:#{remote}" : volume
+      end
+    end
+
+    def try(*a, &b)
+      respond_to?(a.first, true) ? send(*a, &b) : nil
     end
   end
 end

data/lib/ludwig/version.rb

@@ -1,3 +1,3 @@
 module Ludwig
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ludwig
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Brian Stolz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander