egg 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 78400ef63b85075bae4dea0fe174b765215c5d4c
-  data.tar.gz: a96ea239294e05e85e85d247fea18c48bfa3634d
+SHA256:
+  metadata.gz: 32bcf99fe8e9537b1e235446d51b86eccfaaf810a7340e70b0d6f526a2a59d4d
+  data.tar.gz: dd3fb8262550cd37467f042596b4dc4afa6b0639438e42cc769c678107e3345d
 SHA512:
-  metadata.gz: 4ecc1400f44c3c7ad1c452011c7d34525af61cd942aa9bf042afcdbb12fd86c98a328bfcc08eb174c5d48dc32e1aa0ff743fd962b8d08612cf8057bedbae610e
-  data.tar.gz: 8e99cb10911f5834bec8f0dd862ef1cf883e856f5220abef602229365b7f473651a10fb0958d3e6ffe51877fc5928d2ef17dfa84ae200ca2a4c950c16f8b186a
+  metadata.gz: be762f48f2481312dc4bb5aedacf18ab11180b7524d4170ae56fa47c5acbed548b9ae2b4e28dd5660499fe92900e494a95c6dbb0cc6301b741f91b86329a4857
+  data.tar.gz: bf527d2016aa0553b048cc890c14a415cffc2dea656dbf0048da7da7f2a233b76772f40862ca30593c39513abe3905f74165906547f00a2b5e311c1c405edc8f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    egg (0.8.0)
+    egg (0.10.0)
       thor (~> 0.19.0)
 
 GEM

data/lib/egg.rb

@@ -13,4 +13,3 @@ require_relative "egg/version"
 require_relative "egg/cli"
 require_relative "egg/templates"
 require_relative "egg/configuration"
-require_relative "egg/docker_compose"

data/lib/egg/cli.rb

@@ -38,7 +38,6 @@ module Egg
     desc "build", "Just build the docker containers"
     def build
       config = Configuration.load "./egg_config.rb"
-      config.write_docker_files
       config.docker_pull_build
     end
   end

data/lib/egg/configuration.rb

@@ -22,17 +22,13 @@ module Egg
       warn e.backtrace.join("\n")
     end
 
-    attr_accessor :docker_compose,
-                  :ssh_support,
-                  :ruby_version,
+    attr_accessor :ssh_support,
                   :supervisor,
                   :dotenv
 
     def initialize(&configuration_block)
-      self.docker_compose = DockerCompose.new
       self.ssh_support = false
-      self.ruby_version = "2.4"
-      self.dotenv = DotenvUtil.new(File.read(".env.template"))
+      self.dotenv = DotenvUtil.new(File.read(".env.template")) if File.exist?(".env.template")
       instance_eval(&configuration_block)
       self
     end
@@ -64,19 +60,10 @@ module Egg
     end
 
     def run_setup
-      write_docker_files
-
       docker_pull_build
-      File.write(".env", dotenv.generate_env)
-
       run_after_startup
     end
 
-    def write_docker_files
-      dockerignore = Templates[".dockerignore"].result(binding)
-      File.write(".dockerignore", dockerignore)
-    end
-
     def docker_pull_build
       system("docker-compose pull")
       system("docker-compose build") || raise($CHILD_STATUS)

data/lib/egg/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egg
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Carl Thuringer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -145,12 +145,9 @@ files:
 - lib/egg.rb
 - lib/egg/cli.rb
 - lib/egg/configuration.rb
-- lib/egg/docker_compose.rb
-- lib/egg/docker_compose/service.rb
 - lib/egg/templates.rb
 - lib/egg/version.rb
 - templates/.dockerignore
-- templates/docker-compose.yml
 - templates/egg_config.rb
 - templates/supervisord.conf
 homepage: http://github.com/bellycard/egg
@@ -174,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Egg helps you develop with Docker!

data/lib/egg/docker_compose.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require "yaml"
-
-# Wraps the generation of Docker Compose file
-class DockerCompose
-  attr_reader :docker_compose,
-              :services
-
-  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
-    yield docker_compose
-  end
-
-  def to_yaml
-    output = { "version" => "2" }
-    output["services"] = services.each_with_object({}) do |service, hash|
-      hash[service.name] = service.to_hash
-    end
-
-    output.to_yaml
-  end
-
-  def service(name)
-    service = Service.new(name)
-    services << service
-    service
-  end
-end
-
-require_relative "docker_compose/service"

data/lib/egg/docker_compose/service.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-class DockerCompose
-  # Wraps the definition of docker-compose services
-  class Service
-    attr_reader :name, :links, :environment
-    attr_accessor :dockerfile,
-                  :command,
-                  :ports,
-                  :volumes,
-                  :image
-
-    def initialize(name)
-      @name = name
-
-      @links = []
-      @environment = []
-    end
-
-    def link(service)
-      @links << service.name
-    end
-
-    def env(variable, value)
-      @environment << "#{variable}=#{value}"
-    end
-
-    def to_hash
-      output = {
-        "environment" => environment,
-        "links" => links,
-        "volumes" => volumes,
-        "ports" => ports
-      }
-
-      image ? output["image"] = image : output["build"] = "."
-      output["command"] = command if command
-      output.each_with_object({}) { |(k, v), hash| hash[k] = v if v }
-    end
-  end
-end

data/templates/docker-compose.yml

@@ -1,10 +0,0 @@
-version: '2'
-
-services:
-  app: &app
-    build: .
-    command: rails s -p 3000
-    ports:
-      - "3000:3000"
-    volumes:
-      - .:/app