ludwig 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5a2bda97dc8c29beceb35b686578aed84e59a1d
-  data.tar.gz: 02bcc4b31e7400e314a100f38b50132451e2966d
+  metadata.gz: 0b60bb41e36584ba8aac79780e599d4e9bea3249
+  data.tar.gz: 8863a356d1a716d4f85fed2b303025ec06cd99ea
 SHA512:
-  metadata.gz: 4b9d5f33fab50f542b90a6ff98e5822cf8a73e7775d55aab9b39d4d848af2cb252492d1580fb993f6fbf68061046e0d841050dac24676a5b9032fb800952025f
-  data.tar.gz: f2d92e30af42c6f9cab36a5aa06af0ee249640ecd043492a0dbea9d6e54bd927d5ee248bb0beb8bba4992b66ad698f2c7c156b3bf1c161e06ff0408e0bac79c1
+  metadata.gz: 170c200fdabfcd32cae8d1afa9bb82083f2eb3c03f3cd007b867e2d8e82ec0161b501e9cf326f44f758076cd45877d297cc56818bda0ee6f10c59eba08c17bec
+  data.tar.gz: 83224d7dc22c138b0178c683eb5bda14cdd4eea9bc425b377c768c5a0b4a70c90393fcd290aa83c8339c36e2a4f9f40bbeefd520daccd20d1ff393cec6c26170

data/lib/ludwig/cli.rb

@@ -3,26 +3,44 @@ require 'yaml'
 module Ludwig
   class CLI
     include Commander::Methods
+
     def run
       program :version, Ludwig::VERSION
       program :description, 'Ludwig, the famous composer'
 
-      @config = "ludwig.yml"
+      @config_file = 'ludwig.yml'
 
       global_option('-d', '--debug', 'Enable debug mode') { $debug = true }
-      global_option('-c', '--config filename', String, 'Set config filename') { |config| @config = config }
+      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'
         c.action do |args, options|
-          config = YAML.load_file(@config)
-          composer = Ludwig::Composer.new(config, options)
-          composer.write_yaml
-          system("docker-compose up")
+          generate_compose_file
+          system 'docker-compose up'
+        end
+      end
+
+      command :build do |c|
+        c.syntax = 'ludwig build [options]'
+        c.summary = 'Generate docker-compose.yml'
+        c.action do |args, options|
+          generate_compose_file
         end
       end
+
       run!
     end
+
+    private
+
+    def config
+      @config ||= YAML.load_file @config_file
+    end
+
+    def generate_compose_file
+      Ludwig::Composer.new(config).write_yaml
+    end
   end
 end

data/lib/ludwig/composer.rb

@@ -1,5 +1,5 @@
 module Ludwig
-  class Composer < Struct.new(:config, :options)
+  class Composer < Struct.new(:config)
     def write_yaml
       File.open('docker-compose.yml','w') do |h|
         h.write generate_yaml
@@ -14,7 +14,7 @@ module Ludwig
       config["available_projects"].each_with_object({}) do |project, new_compose_data|
         data = YAML.load_file("../#{project}/docker-compose.yml")
         data.each do |service_name, service_data|
-          service = Service.new(service_name, service_data, project, config)
+          service = Service.new(project, service_name, service_data, config)
           new_compose_data["#{sanitize(project)}_#{service_name}"] = service.generate_yaml
         end
       end.to_yaml

data/lib/ludwig/service.rb

@@ -1,22 +1,25 @@
 module Ludwig
-  class Service < Struct.new(:name, :data, :project, :config)
+  class Service < Struct.new(:project, :name, :data, :config)
     ACTION_MAP = {
-      volumes: :volumes_action,
-      links: :links_action,
+      volumes:  :volumes_action,
+      links:    :links_action,
       env_file: :prefix_path,
-      build: :prefix_path
+      build:    :prefix_path
     }
 
     def generate_yaml
-      data.each_with_object({}) do |(service, service_data), new_data|
-        new_data[service] = execute_action(service, service_data)
-        if extra_links = config["extra_links"][service]
-          extra_links.each do |app|
-            new_data["links"] ||= []
-            new_data["links"] << "#{sanitize(app)}_#{config["default_app"]}:#{sanitize(app)}"
-          end
+      new_data = data.each_with_object({}) do |(key, value), memo|
+        memo[key] = execute_action(key, value)
+      end
+
+      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
+
+      new_data
     end
 
     def execute_action(key, obj)

data/lib/ludwig/version.rb

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

metadata

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