dockercompose-generator 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce43c3684c9259b4c1272324a0867c8e374164a5
-  data.tar.gz: 88c6897c33bb37782a46fb94264bb6f415ffbbfb
+  metadata.gz: 0e2843149bb1dbcb62bcb1ce08dd562597fcbd8d
+  data.tar.gz: 383e5724e2c78c622e6ecda1c27b52f81763f665
 SHA512:
-  metadata.gz: 0e760b9e7d2db5f11ef36f56633f07e8bc03654637b5d97576b57a637e451fb5dbd6a76a326df366779da077be30723be5eea9cda16597b81bc27771778c1545
-  data.tar.gz: 281853a06adff75a9df3869c844e06e298c19f16873f1eb33a68beaee563669ddb108772da000415092c1d5446159a8a988b09b34e4302df0befed72ae0d50b3
+  metadata.gz: 2963ac53dfaf2aad7a3e682333ca74392d9f972febf703adebf7257757460885d8cddfc63aec41c342336d2c9d8c6b3459b8f68d3060683dd67ad96268a92b72
+  data.tar.gz: 8fd950e79eb17170f3ff011d3e582a97533209285138fe5bc1713f02416d09fe349ceac51b77ba8fbbc3513651bb4ee291c38f60452bfcb41788c756f8867306

data/README.md

@@ -57,8 +57,8 @@ web:
 
 ## TODO
 
-- Support more options than `links`, `ports`, and `environment` variables
-- Add an Importer to seed the services
+- ~~Support more options than `links`, `ports`, and `environment` variables~~
+- ~~Add an Importer to seed the services~~
 
 ## Contributing
 

data/Rakefile

@@ -1,5 +1,4 @@
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)

data/lib/docker-compose/generator.rb

@@ -11,18 +11,37 @@ module DockerCompose
     # @param [Hash]
     @services = {}
 
+    # Create a new service
+    #
+    # @param [String] name
+    #   The name of the service in docker
+    # @param [String] image
+    #   The Image that the service will use in docker
+    # @return [Service]
     def self.create_service(name, image)
       @services[name] = Service.new(name, image)
     end
 
+    # Does this service exist?
+    #
+    # @param [String] name
+    #   The name of the service to check for
+    # @return [Boolean]
     def self.service?(name)
       (@services[name])
     end
 
+    # Return a Service
+    #
+    # @param [String] name
+    #   The name of the service to return
+    #
+    # @return [Service]
     def self.get_service(name)
       @services[name] if self.service?(name)
     end
 
+    # Convert The Services to Yaml
     def self.to_yaml
       yaml = {}
 
@@ -32,5 +51,21 @@ module DockerCompose
 
       yaml.to_yaml
     end
+
+    # Reset the List of Services
+    def self.reset!
+      @services = {}
+    end
+
+    # Import
+    #
+    # @param [Hash] yaml_object
+    #   The yaml object to convert to services
+    def self.import(yaml_object)
+      yaml_object.each do |key, value|
+        service = create_service(key, value['image'])
+        service.import(value)
+      end
+    end
   end
 end

data/lib/docker-compose/generator/service.rb

@@ -29,6 +29,13 @@ module DockerCompose
 
       attr_reader :name, :attrs
 
+      # Initialize Method
+      #
+      # @param [String] name
+      #   The name of the service
+      #
+      # @param [String] image
+      #   The image to use
       def initialize(name, image)
         @name = name
         @attrs = {
@@ -43,7 +50,7 @@ module DockerCompose
       [:build, :dockerfile, :command, :working_dir, :entrypoint, :user,
        :hostname, :domainname, :mac_address, :mem_limit, :memswap_limit,
        :privileged, :restart, :stdin_open, :tty, :cpu_shares, :cpuset,
-       :read_only, :volume_driver, :container_name].each do |method|
+       :read_only, :volume_driver, :container_name, :image].each do |method|
         define_method "#{method}?" do
           (@attrs["#{method}"])
         end
@@ -72,6 +79,14 @@ module DockerCompose
         end
       end
 
+      # Import the attrs hash
+      #
+      # @param [Hash] attrs
+      #   The attribute hash from the main import
+      def import(attrs)
+        @attrs = attrs
+      end
+
       private
 
       def add_to_array(array_name, value)

data/lib/docker-compose/generator/version.rb

@@ -7,7 +7,7 @@ module DockerCompose
 
     # Current minor release.
     # @return [Integer]
-    MINOR = 2
+    MINOR = 3
 
     # Current patch level.
     # @return [Integer]

data/spec/docker-compose/generator/service_spec.rb

@@ -53,6 +53,14 @@ describe 'DockerCompose::Generator::Service' do
     end
   end
 
+  context '#image' do
+    it 'allows changing the image' do
+      expect(service.attrs['image']).to eq('test_image')
+      service.image = 'new_image'
+      expect(service.attrs['image']).to eq('new_image')
+    end
+  end
+
 
   context 'environment' do
     it 'sets environment variable' do

data/spec/docker-compose/generator_spec.rb

@@ -42,6 +42,24 @@ describe 'DockerCompose::Generator' do
         expect(DockerCompose::Generator.get_service('test_spec')).to eq(srv)
       end
     end
+  end
+
+  context '#import' do
+    let(:file) { fixture('import1.yml') }
+
+    before(:each) do
+      DockerCompose::Generator.reset!
+      DockerCompose::Generator.import(YAML.load(file))
+    end
 
+    it 'will create three items' do
+      expect(DockerCompose::Generator.get_service('web')).to be_a(DockerCompose::Generator::Service)
+      expect(DockerCompose::Generator.get_service('elastic')).to be_a(DockerCompose::Generator::Service)
+      expect(DockerCompose::Generator.get_service('db')).to be_a(DockerCompose::Generator::Service)
     end
+
+    it 'will return the same yaml after import' do
+      expect(DockerCompose::Generator.to_yaml).to eq(fixture_read('import1.yml'))
+    end
+  end
 end

data/spec/fixtures/import1.yml

@@ -0,0 +1,17 @@
+---
+elastic:
+  image: elasticsearch:1.4
+db:
+  image: mysql:5.6
+  environment:
+    MYSQL_ROOT_PASSWORD: test
+    MYSQL_DATABASE: test
+    MYSQL_USER: test
+    MYSQL_PASSWORD: test
+web:
+  image: php:5.6-apache
+  links:
+  - db:mysql
+  - elastic
+  ports:
+  - 80:80

data/spec/helper.rb

@@ -20,3 +20,14 @@ RSpec.configure do |config|
   config.raise_errors_for_deprecations!
 end
 
+def fixture_path
+  File.expand_path('../fixtures', __FILE__)
+end
+
+def fixture(file)
+  File.new(fixture_path + '/' + file)
+end
+
+def fixture_read(file)
+  File.read(fixture_path + '/' + file)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockercompose-generator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jon Whitcraft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - lib/docker-compose/generator/version.rb
 - spec/docker-compose/generator/service_spec.rb
 - spec/docker-compose/generator_spec.rb
+- spec/fixtures/import1.yml
 - spec/helper.rb
 homepage: https://github.com/jwhitcraft/dockercompose-generator
 licenses:
@@ -88,12 +89,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Programmatically create a yaml file for docker-compose
 test_files:
 - spec/docker-compose/generator/service_spec.rb
 - spec/docker-compose/generator_spec.rb
+- spec/fixtures/import1.yml
 - spec/helper.rb
-has_rdoc: