ufo 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9432f2c3713a1f96731dd9e6a5cc7101521da75
-  data.tar.gz: d9a4ca89067032cfbc4dc2321f1695b1a0a52d53
+  metadata.gz: 70e2da23bce8f5526cc2c44e2038b8548001854a
+  data.tar.gz: 71cb5de075c4d1fe268ce864405369b5b290c79f
 SHA512:
-  metadata.gz: 45c58c951fef5bd1cf2ee84010d9e6d66a030ca84953f73c41fec0e3376a95f5ccfc0c48d584bfa0b5ca76ae9b158f36ce0ee7508386a94ea995404779a2e696
-  data.tar.gz: 9223378f163ecedaba6bd91a92dc8f7a50e8c8975ec34167da41084c08aba1f4689b3478954d19636d1116e608aa4f4a0c04070c4d1146b2de6793c2a2b09d24
+  metadata.gz: 00d74b27a780c3cfec842868ae2feadea18dc83ab3fd279896b7f2995db1a84a03be2f1119ba46f3ca67c437f8599fc9ba297ad9b3347d9cad760669b1a0d19d
+  data.tar.gz: 4cd0f300b83bd95b44955881c32b09566f16f9e3a8e14fc28e7a732cb8128518372b86eb24d56393b0de637870ea2bc7c3c25b926180c0b6c5ad2ff294fa962d

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.1.5]
+
+* helper.env_file instead of env_vars method
+
 ## [0.1.2]
 
 * remove byebug dependency and fix task register task

data/lib/starter_project/ufo/task_definitions.rb

@@ -12,7 +12,7 @@ common = {
   image: helper.full_image_name, # includes the git sha tongueroo/hi:ufo-[sha].
   cpu: 128,
   memory_reservation: 256,
-  environment: env_file(".env")
+  environment: helper.env_file(".env")
 }
 
 task_definition "<%= @app %>-web" do

data/lib/ufo/cli.rb

@@ -12,7 +12,7 @@ module Ufo
       builder.push if options[:push]
     end
 
-    desc "base", "builds docker image from Dockerfile.base"
+    desc "base", "builds docker image from Dockerfile.base and update current Dockerfile"
     long_desc CLI::Help.docker_base
     option :push, type: :boolean, default: true
     def base

data/lib/ufo/dsl.rb

@@ -55,37 +55,6 @@ module Ufo
       @task_definitions << TaskDefinition.new(self, name, @options, &block)
     end
 
-    def env_vars(text)
-      lines = filtered_lines(text)
-      lines.map do |line|
-        key,value = line.strip.split("=").map {|x| x.strip}
-        {
-          name: key,
-          value: value,
-        }
-      end
-    end
-
-    def env_file(path)
-      full_path = "#{@project_root}/#{path}"
-      unless File.exist?(full_path)
-        puts "The #{full_path} env file could not be found.  Are you sure it exists?"
-        exit 1
-      end
-      text = IO.read(full_path)
-      env_vars(text)
-    end
-
-    def filtered_lines(text)
-      lines = text.split("\n")
-      # remove comment at the end of the line
-      lines.map! { |l| l.sub(/#.*/,'').strip }
-      # filter out commented lines
-      lines = lines.reject { |l| l =~ /(^|\s)#/i }
-      # filter out empty lines
-      lines = lines.reject { |l| l.strip.empty? }
-    end
-
     def helper
       Helper.new(@options)
     end

data/lib/ufo/dsl/helper.rb

@@ -28,6 +28,37 @@ module Ufo
 
       #############
       # helper methods
+      def env_vars(text)
+        lines = filtered_lines(text)
+        lines.map do |line|
+          key,value = line.strip.split("=").map {|x| x.strip}
+          {
+            name: key,
+            value: value,
+          }
+        end
+      end
+
+      def filtered_lines(text)
+        lines = text.split("\n")
+        # remove comment at the end of the line
+        lines.map! { |l| l.sub(/#.*/,'').strip }
+        # filter out commented lines
+        lines = lines.reject { |l| l =~ /(^|\s)#/i }
+        # filter out empty lines
+        lines = lines.reject { |l| l.strip.empty? }
+      end
+
+      def env_file(path)
+        full_path = "#{@project_root}/#{path}"
+        unless File.exist?(full_path)
+          puts "The #{full_path} env file could not be found.  Are you sure it exists?"
+          exit 1
+        end
+        text = IO.read(full_path)
+        env_vars(text)
+      end
+
       def settings
         @settings ||= Settings.new(@project_root)
       end

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-16 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor