egg 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78b772cde743c04ccb4592b24da7345460149b2a
-  data.tar.gz: 4df4dcb8cbe47b91274a7718d03e29082214a490
+  metadata.gz: d75e3a224f4e96b79ba91e6e62b43b46efed0f15
+  data.tar.gz: 835698e87464bf1fe70cbcdb3bfa910c7c4c1054
 SHA512:
-  metadata.gz: 156ebf1cc206873d0373421c857353805d921fe7b51da4cef3b085bd33b38cde80350c4941c16259de33390688ba0c72c79fc8c7925a09d0369854cf968133b2
-  data.tar.gz: 1226702a62e2d9539cacceee21aab88175e33b7b4ec1b9aba57ecc2be3261d7c0a7583a5c6596c7b0f9908fc48a15f7c6deaffe865e133137fbf4965d1d72076
+  metadata.gz: ed225dc0cc7953ab54988a3d337147d9f9e6bdac9a24a589b749f81d223fb512dc68a2fc52a8292c2d973bbaad21041611e284ec1fa8dc1fddac18a4df36b7e2
+  data.tar.gz: fab3916a82f6eff8524a9c4c9f7de4ade7c1a32c922ef070e7a4726c2fc1dbff1cf8bfe89919fd7f196a38c5dd34068d7f3c557427a5f2af09ea0752f71ebf74

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    egg (0.4.1)
+    egg (0.5.0)
       thor (~> 0.19.4)
 
 GEM
@@ -87,4 +87,4 @@ DEPENDENCIES
   rspec_junit_formatter (~> 0.2.3)
 
 BUNDLED WITH
-   1.15.3
+   1.15.4

data/README.md

@@ -14,7 +14,7 @@ Maintainers:
 * [Jason Sisk](https://github.com/sisk)
 
 This gem is currently heavily focused on Ruby and Rails projects relevant within 
-the Belly organization. The eventual goal is for this to become language and 
+the Hatch organization. The eventual goal is for this to become language and 
 framework agnostic, though the configuration language will be Ruby. 
 
 ## Installation

data/lib/egg/dockerfile/base.rb

@@ -18,9 +18,7 @@ module Egg
           raise(MissingPropertyError, "Must populate #{attr}") if send(attr).nil?
         end
 
-        unrendered_output = template.reduce("") do |out, (command, string)|
-          out << command.to_s.upcase << " " << string << "\n"
-        end
+        unrendered_output = compile_unrendered_output
 
         ERB.new(unrendered_output).result(binding)
       end
@@ -29,6 +27,13 @@ module Egg
         template.insert(do_before(before), [:run, command])
       end
 
+      def env(env_hash)
+        env_string = env_hash.reduce("") do |out, (key, value)|
+          out << key.to_s.upcase << '="' << value.to_s << '" '
+        end
+        template << [:env, env_string]
+      end
+
       private
 
       def do_before(before)
@@ -36,6 +41,13 @@ module Egg
           template.index { |tc| tc[0] == before[0] } ||
           -1
       end
+
+      def compile_unrendered_output
+        final_template = template << [:cmd, "<%= command %>"]
+        final_template.reduce("") do |out, (command, string)|
+          out << command.to_s.upcase << " " << string << "\n"
+        end
+      end
     end
   end
 end

data/lib/egg/dockerfile/node_js.rb

@@ -25,8 +25,7 @@ module Egg
           [:add, "package.json $APP_HOME/"],
           [:add, "yarn.lock $APP_HOME/"],
           [:run, "yarn install"],
-          [:add, ". $APP_HOME"],
-          [:cmd, "<%= command %>"]
+          [:add, ". $APP_HOME"]
         ]
       end
     end

data/lib/egg/dockerfile/ruby.rb

@@ -29,8 +29,7 @@ module Egg
           [:add, "Gemfile* $APP_HOME/"],
           [:env, "BUNDLE_GEMFILE=$APP_HOME/Gemfile BUNDLE_JOBS=4 BUNDLE_WITHOUT=production:staging"],
           [:run, "bundle install"],
-          [:add, ". $APP_HOME"],
-          [:cmd, "<%= command %>"]
+          [:add, ". $APP_HOME"]
         ]
       end
     end

data/lib/egg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Egg
-  VERSION = "0.4.1".freeze
+  VERSION = "0.5.0".freeze
 end

data/templates/.dockerignore

@@ -4,4 +4,5 @@ log
 tmp
 node_modules
 coverage
-public/system
+public/system
+.env

data/templates/egg_config.rb

@@ -8,6 +8,7 @@ Egg::Configuration.new do |config|
   # self.dockerfile = Dockerfile.use "Ruby"
   # self.dockerfile.ruby_version = "2.4.0"
   # self.dockerfile.command = "bin/rails server -p 3000"
+  # self.dockerfile.env(dotenv.env)
 
   # Example docker_compose config:
   # app = config.docker_compose.service "app"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egg
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Carl Thuringer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor