egg 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6026a5fd53c8dee0e89b2e8d5955c8ad2a16da24
-  data.tar.gz: b472e4fb29268a868cfb69b1ca5fbf65964c084c
+  metadata.gz: 78400ef63b85075bae4dea0fe174b765215c5d4c
+  data.tar.gz: a96ea239294e05e85e85d247fea18c48bfa3634d
 SHA512:
-  metadata.gz: 6b0ee4a2cf0533f140bdfa452bd06a7ff9404887656bd58e0999ae14fa699e32213fa0d5a527be293ae1bd08163108e32592596c629fedf663464868f4223234
-  data.tar.gz: 844ce17d559b2bcb9fdf2c591ab7001e99f30cce85ef2fc486288d230a535cc8f479712b97583dc01cb19096608ca175cc4d00cd1f179fb5c38afe0dd09f627d
+  metadata.gz: 4ecc1400f44c3c7ad1c452011c7d34525af61cd942aa9bf042afcdbb12fd86c98a328bfcc08eb174c5d48dc32e1aa0ff743fd962b8d08612cf8057bedbae610e
+  data.tar.gz: 8e99cb10911f5834bec8f0dd862ef1cf883e856f5220abef602229365b7f473651a10fb0958d3e6ffe51877fc5928d2ef17dfa84ae200ca2a4c950c16f8b186a

data/.gitignore

@@ -8,3 +8,5 @@
 
 .idea
 /spec/examples.txt
+
+.DS_Store

data/lib/egg.rb

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

data/lib/egg/cli.rb

@@ -16,7 +16,6 @@ module Egg
       else
         File.write("egg_config.rb", config.result)
         print "Wrote example egg_config.rb, customize it to suit your app"
-        write_git_ignorance
       end
     end
 
@@ -42,15 +41,5 @@ module Egg
       config.write_docker_files
       config.docker_pull_build
     end
-
-    private
-
-    def write_git_ignorance
-      gitignore = File.read(".gitignore")
-      gitignore << "Dockerfile\n" unless /^Dockerfile$/ =~ gitignore
-      gitignore << ".dockerignore\n" unless /^\.dockerignore$/ =~ gitignore
-      gitignore << "docker-compose.yml\n" unless /^docker-compose\.yml$/ =~ gitignore
-      File.write(".gitignore", gitignore)
-    end
   end
 end

data/lib/egg/configuration.rb

@@ -26,8 +26,7 @@ module Egg
                   :ssh_support,
                   :ruby_version,
                   :supervisor,
-                  :dotenv,
-                  :dockerfile
+                  :dotenv
 
     def initialize(&configuration_block)
       self.docker_compose = DockerCompose.new
@@ -35,7 +34,7 @@ module Egg
       self.ruby_version = "2.4"
       self.dotenv = DotenvUtil.new(File.read(".env.template"))
       instance_eval(&configuration_block)
-      self # rubocop:disable Lint/Void
+      self
     end
 
     def after_startup(&block)
@@ -76,8 +75,6 @@ module Egg
     def write_docker_files
       dockerignore = Templates[".dockerignore"].result(binding)
       File.write(".dockerignore", dockerignore)
-
-      File.write("docker-compose.yml", docker_compose.to_yaml)
     end
 
     def docker_pull_build

data/lib/egg/docker_compose.rb

@@ -9,6 +9,7 @@ class DockerCompose
 
   def initialize(_compose_config = {})
     @services = []
+    print "Use of docker_compose is deprecated. Please craft the docker-compose.yml file yourself. This module will be dropped in a future egg."
   end
 
   def configure

data/lib/egg/version.rb

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

data/templates/egg_config.rb

@@ -3,23 +3,6 @@
 Egg::Configuration.new do |config|
   # Do stuff here.
 
-  # Example dockerfile config.
-  # Available arguments for use: ["Ruby", "NodeJS"]
-  # 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"
-  # app.ports = ["3000:3000"]
-  # app.volumes = [".:/app"]
-
-  # db = config.docker_compose.service "db"
-  # db.image = "mysql"
-  # db.env "MYSQL_ROOT_PASSWORD", "mysqliswebscale"
-  # app.link db
-
   # after_startup do
   #   docker_exec "app", "rake db:setup db:seed"
   #   dotenv.set("foo", "bar")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egg
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Carl Thuringer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -147,10 +147,6 @@ files:
 - 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

data/lib/egg/dockerfile.rb

@@ -1,18 +0,0 @@
-module Egg
-  # Configures dockerfiles programmatically from templates.
-  module Dockerfile
-    class NoDockerfileError < StandardError; end
-    class MissingPropertyError < StandardError; end
-
-    def self.use(klass)
-      print "Dockerfile.use is deprecated. Egg setup will no longer write your dockerfile, please craft it yourself."
-      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

@@ -1,76 +0,0 @@
-module Egg
-  module Dockerfile
-    # Provides shared behavior for dockerfile template classes.
-    class Base
-      # Raise when before and after are both used at the same time.
-      class QuantumStateError < RuntimeError
-        def message
-          "Directives cannot happen both before and after a given directive"
-        end
-      end
-
-      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 = compile_unrendered_output
-
-        ERB.new(unrendered_output).result(binding)
-      end
-
-      def run(command, before: [:cmd], after: nil)
-        insert_with_before_after([:run, command], before: before, after: after)
-      end
-
-      def env(env_hash, **before_after)
-        env_string = env_hash.reduce("") do |out, (key, value)|
-          out << key.to_s.upcase << '="' << value.to_s << '" '
-        end
-        insert_with_before_after([:env, env_string], before_after)
-      end
-
-      def add(localpath, containerpath, **before_after)
-        directive = [:add, localpath + " " + containerpath]
-        insert_with_before_after(directive, before_after)
-      end
-
-      private
-
-      def insert_with_before_after(directive, before: nil, after: nil)
-        raise(QuantumStateError) if before && after
-        if before
-          template.insert(find_directive_in_template(before), directive)
-        elsif after
-          template.insert(find_directive_in_template(after) + 1, directive)
-        else
-          template << directive
-        end
-      end
-
-      def find_directive_in_template(directive)
-        template.index(directive) ||
-          template.index { |tc| tc[0] == directive[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

@@ -1,33 +0,0 @@
-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"]
-        ]
-      end
-    end
-  end
-end

data/lib/egg/dockerfile/ruby.rb

@@ -1,37 +0,0 @@
-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