egg 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b9c5475543d41a05bb093333ab5b3a1cdee78f2
-  data.tar.gz: 9afc56f4f4d271dbc624f93e24a7c14fe0ef32fb
+  metadata.gz: 5c067e9add07ef645fab9715f3857ebd182246d5
+  data.tar.gz: a8832055723ae1426ea9dc387f92252035596fba
 SHA512:
-  metadata.gz: a03a957c186f32a3ab7a626358845680e98ca68480762580b55cfc89d75469166661e67b48fcad22d04d6ff5f771a3c9860ebbcb7b3e521d612e01cef36f666e
-  data.tar.gz: e488ec9f8389d922f111867b63a9b437f75fe4ca31a9e00cc805e9404b137e51d9cb45f034efd36bac9560904339ac806fbead30d5549bf40333a41781b313f2
+  metadata.gz: 3ae5736a532bc87b07f5b1563056a46c7dcc03a056e5971b97d6b9ccdfd3357c44d618c3369a24690140b55c572896f83620034264d33dc4f8322ad4d10cef92
+  data.tar.gz: 35c18a6e95ee2941ae0e0c4a0f142925215d6b51937f84decc463a4f77acdecf946f80a5e075d265791d35091792607a4ced6bb0eea8650613b65dee0ada5170

data/.circleci/config.yml

@@ -13,6 +13,7 @@ jobs:
       - checkout
       - type: cache-restore
         key: egg-bundler-{{ checksum "Gemfile.lock" }}
+      - run: gem install bundler
       - run: bundle install --path vendor/bundle
       - type: cache-save
         key: egg-bundler-{{ checksum "Gemfile.lock" }}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    egg (0.3.3)
+    egg (0.4.0)
       thor (~> 0.19.4)
 
 GEM

data/README.md

@@ -1,6 +1,13 @@
-# Egg
 
-Egg helps prevent code fires! Also he makes it easy to run complex multi-service apps with Docker.
+<h1 align="center">
+    <img src="egg.png" width="300" alt="Egg">
+    <br>
+    <br>
+</h1>
+
+![CircleCI](https://circleci.com/gh/bellycard/egg.png?style=shield&circle-token=10677521a50bce69aca6ec419794d1c44d3cd12a) [![Gem Version](https://badge.fury.io/rb/egg.svg)](https://badge.fury.io/rb/egg)
+
+> Egg helps prevent code fires! Also he makes it easy to run complex multi-service apps with Docker.
 
 Maintainers:
 * [Carl Thuringer](https://github.com/carlthuringer)

data/{leash.gemspec → egg.gemspec}

@@ -2,7 +2,8 @@
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "Egg/version"
+
+require "egg/version"
 
 description = <<-EOT
   Egg helps initialize, manage, and execute on complex multi-service architectures using Docker and Docker Compose

data/lib/egg.rb

@@ -14,3 +14,4 @@ require_relative "egg/cli"
 require_relative "egg/templates"
 require_relative "egg/configuration"
 require_relative "egg/docker_compose"
+require_relative "egg/dockerfile"

data/lib/egg/configuration.rb

@@ -3,7 +3,6 @@
 require "yaml"
 require "fileutils"
 require "dotenv_util"
-require "dockerfile"
 require "open3"
 
 module Egg
@@ -54,6 +53,17 @@ module Egg
       end
     end
 
+    # You may pass a block to docker_run to read the output in a controlled manner.
+    def docker_run(app, command)
+      print "docker-compose run #{app} #{command}\n"
+      Open3.popen2(%(docker-compose run #{app} #{command})) do |_input, output, wait_thread|
+        output_read = output.read
+        print output_read + "\n"
+        yield output_read if block_given?
+        wait_thread.value.success? || raise(StandardError, "docker_run exited with #{wait_thread.value.to_i}")
+      end
+    end
+
     def run_setup
       write_docker_files
 

data/lib/egg/dockerfile.rb

@@ -0,0 +1,17 @@
+module Egg
+  # Configures dockerfiles programmatically from templates.
+  module Dockerfile
+    class NoDockerfileError < StandardError; end
+    class MissingPropertyError < StandardError; end
+
+    def self.use(klass)
+      const_get("Egg::Dockerfile::#{klass}").new
+    rescue NameError
+      raise(NoDockerfileError, "No Dockerfile subclass for #{klass}.")
+    end
+  end
+end
+
+require_relative "dockerfile/base"
+require_relative "dockerfile/ruby"
+require_relative "dockerfile/node_js"

data/lib/egg/dockerfile/base.rb

@@ -0,0 +1,41 @@
+module Egg
+  module Dockerfile
+    # Provides shared behavior for dockerfile template classes.
+    class Base
+      attr_reader :template
+      attr_accessor :command
+
+      def initialize
+        @template = []
+      end
+
+      def required_attributes
+        [:command]
+      end
+
+      def render
+        required_attributes.each do |attr|
+          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
+
+        ERB.new(unrendered_output).result(binding)
+      end
+
+      def run(command, before: [:cmd])
+        template.insert(do_before(before), [:run, command])
+      end
+
+      private
+
+      def do_before(before)
+        template.index(before) ||
+          template.index { |tc| tc[0] == before[0] } ||
+          -1
+      end
+    end
+  end
+end

data/lib/egg/dockerfile/node_js.rb

@@ -0,0 +1,34 @@
+module Egg
+  module Dockerfile
+    # NodeJS Dockerfile Template
+    # Required Attributes:
+    # @node_version: Version of Ruby to use for the ruby image.
+    class NodeJS < Base
+      def required_attributes
+        super + [:node_version]
+      end
+
+      attr_accessor :node_version
+
+      def initialize
+        @template = dockerfile
+      end
+
+      private
+
+      def dockerfile # rubocop:disable Metrics/MethodLength
+        [
+          [:from, "node:<%= node_version %>"],
+          [:env, "APP_HOME /app"],
+          [:run, "mkdir $APP_HOME"],
+          [:workdir, "$APP_HOME"],
+          [:add, "package.json $APP_HOME/"],
+          [:add, "yarn.lock $APP_HOME/"],
+          [:run, "yarn install"],
+          [:add, ". $APP_HOME"],
+          [:cmd, "<%= command %>"]
+        ]
+      end
+    end
+  end
+end

data/lib/egg/dockerfile/ruby.rb

@@ -0,0 +1,37 @@
+module Egg
+  module Dockerfile
+    # Ruby Dockerfile Template
+    # Required Attributes:
+    # @ruby_version: Version of Ruby to use for the ruby image.
+    class Ruby < Base
+      def required_attributes
+        super + [:ruby_version]
+      end
+
+      attr_accessor :ruby_version
+
+      def initialize
+        @template = dockerfile
+      end
+
+      private
+
+      def dockerfile # rubocop:disable Metrics/MethodLength
+        [
+          [:from, "ruby:<%= ruby_version %>"],
+          [:run, "apt-get update -qq && apt-get upgrade -qqy"],
+          [:run, "apt-get -qqy install cmake"],
+          [:run, "gem install bundler"],
+          [:env, "APP_HOME /app"],
+          [:run, "mkdir $APP_HOME"],
+          [:workdir, "$APP_HOME"],
+          [:add, ".ruby-version $APP_HOME/"],
+          [:add, "Gemfile* $APP_HOME/"],
+          [:env, "BUNDLE_GEMFILE=$APP_HOME/Gemfile BUNDLE_JOBS=4 BUNDLE_WITHOUT=production:staging"],
+          [:run, "bundle install"],
+          [:add, ". $APP_HOME"]
+        ]
+      end
+    end
+  end
+end

data/lib/egg/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egg
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Carl Thuringer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -138,18 +138,19 @@ files:
 - bin/console
 - bin/setup
 - doc/README.md
+- egg.gemspec
+- egg.png
 - exe/egg
-- leash.gemspec
-- lib/dockerfile.rb
-- lib/dockerfile/base.rb
-- lib/dockerfile/node_js.rb
-- lib/dockerfile/ruby.rb
 - lib/dotenv_util.rb
 - lib/egg.rb
 - lib/egg/cli.rb
 - lib/egg/configuration.rb
 - lib/egg/docker_compose.rb
 - lib/egg/docker_compose/service.rb
+- lib/egg/dockerfile.rb
+- lib/egg/dockerfile/base.rb
+- lib/egg/dockerfile/node_js.rb
+- lib/egg/dockerfile/ruby.rb
 - lib/egg/templates.rb
 - lib/egg/version.rb
 - templates/.dockerignore
@@ -177,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Egg helps you develop with Docker!

data/lib/dockerfile.rb

@@ -1,15 +0,0 @@
-# Module that wraps configuration of Dockerfiles from Templates.
-module Dockerfile
-  class NoDockerfileError < StandardError; end
-  class MissingPropertyError < StandardError; end
-
-  def self.use(klass)
-    const_get("Dockerfile::#{klass}").new
-  rescue NameError
-    raise(NoDockerfileError, "No Dockerfile subclass for #{klass}.")
-  end
-end
-
-require_relative "dockerfile/base"
-require_relative "dockerfile/ruby"
-require_relative "dockerfile/node_js"

data/lib/dockerfile/base.rb

@@ -1,39 +0,0 @@
-module Dockerfile
-  # Provides shared behavior for dockerfile template classes.
-  class Base
-    attr_reader :template
-    attr_accessor :command
-
-    def initialize
-      @template = []
-    end
-
-    def required_attributes
-      [:command]
-    end
-
-    def render
-      required_attributes.each do |attr|
-        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
-
-      ERB.new(unrendered_output).result(binding)
-    end
-
-    def run(command, before: [:cmd])
-      template.insert(do_before(before), [:run, command])
-    end
-
-    private
-
-    def do_before(before)
-      template.index(before) ||
-        template.index { |tc| tc[0] == before[0] } ||
-        -1
-    end
-  end
-end

data/lib/dockerfile/node_js.rb

@@ -1,30 +0,0 @@
-module Dockerfile
-  # Wrapper for templating of NodeJS Dockerfile
-  class NodeJS < Base
-    def required_attributes
-      super + [:node_version]
-    end
-
-    attr_accessor :node_version
-
-    def initialize
-      @template = dockerfile
-    end
-
-    private
-
-    def dockerfile # rubocop:disable Metrics/MethodLength
-      [
-        [:from, "node:<%= node_version %>"],
-        [:env, "APP_HOME /app"],
-        [:run, "mkdir $APP_HOME"],
-        [:workdir, "$APP_HOME"],
-        [:add, "package.json $APP_HOME/"],
-        [:add, "yarn.lock $APP_HOME/"],
-        [:run, "yarn install"],
-        [:add, ". $APP_HOME"],
-        [:cmd, "<%= command %>"]
-      ]
-    end
-  end
-end

data/lib/dockerfile/ruby.rb

@@ -1,35 +0,0 @@
-module Dockerfile
-  # Ruby Dockerfile Template
-  # Required Attributes:
-  # @ruby_version: Version of Ruby to use for the ruby image.
-  class Ruby < Base
-    def required_attributes
-      super + [:ruby_version]
-    end
-
-    attr_accessor :ruby_version
-
-    def initialize
-      @template = dockerfile
-    end
-
-    private
-
-    def dockerfile # rubocop:disable Metrics/MethodLength
-      [
-        [:from, "ruby:<%= ruby_version %>"],
-        [:run, "apt-get update -qq && apt-get upgrade -qqy"],
-        [:run, "apt-get -qqy install cmake"],
-        [:run, "gem install bundler"],
-        [:env, "APP_HOME /app"],
-        [:run, "mkdir $APP_HOME"],
-        [:workdir, "$APP_HOME"],
-        [:add, ".ruby-version $APP_HOME/"],
-        [:add, "Gemfile* $APP_HOME/"],
-        [:env, "BUNDLE_GEMFILE=$APP_HOME/Gemfile BUNDLE_JOBS=4 BUNDLE_WITHOUT=production:staging"],
-        [:run, "bundle install"],
-        [:add, ". $APP_HOME"]
-      ]
-    end
-  end
-end