dockly 0.0.2 → 0.0.4

data/dockly.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'docker-api', '~> 1.5.2'
   gem.add_dependency 'dockly-util'
   gem.add_dependency 'excon'
-  gem.add_dependency 'fog', '~> 1.14.0'
+  gem.add_dependency 'fog', '~> 1.18.0'
   gem.add_dependency 'foreman'
   gem.add_dependency 'fpm', '~> 0.4.42'
   gem.add_dependency 'grit'

data/lib/dockly.rb

@@ -16,12 +16,33 @@ require 'dockly/util/tar'
 require 'dockly/util/git'
 
 module Dockly
-  def setup(file = 'dockly.rb')
-    git_sha rescue 'unknown'
-    Dockly::Deb.instances
-    Dockly::Docker.instances
-    Dockly::Foreman.instances
-    instance_eval(IO.read(file), file)
+  attr_reader :instance, :git_sha
+  attr_writer :load_file
+
+  LOAD_FILE = 'dockly.rb'
+
+  def load_file
+    @load_file || LOAD_FILE
+  end
+
+  def inst
+    @instance ||= load_inst
+  end
+
+  def load_inst
+    setup.tap do |state|
+      if File.exists?(load_file)
+        instance_eval(IO.read(load_file), load_file)
+      end
+    end
+  end
+
+  def setup
+    {
+      :debs => Dockly::Deb.instances,
+      :dockers => Dockly::Docker.instances,
+      :foremans => Dockly::Foreman.instances
+    }
   end
 
   {
@@ -30,7 +51,17 @@ module Dockly
     :foreman => Dockly::Foreman
   }.each do |method, klass|
     define_method(method) do |sym, &block|
-      klass.new!(:name => sym, &block)
+      if block.nil?
+        inst[:"#{method}s"][sym]
+      else
+        klass.new!(:name => sym, &block)
+      end
+    end
+  end
+
+  [:debs, :dockers, :foremans].each do |method|
+    define_method(method) do
+      inst[method]
     end
   end
 
@@ -38,7 +69,9 @@ module Dockly
     @git_sha ||= Dockly::Util::Git.git_sha
   end
 
-  module_function :setup, :deb, :docker, :foreman, :git_sha
+  module_function :inst, :load_inst, :setup, :load_file, :load_file=,
+                  :deb,  :docker,  :foreman, :git_sha,
+                  :debs, :dockers, :foremans
 end
 
 require 'dockly/rake_task'

data/lib/dockly/cli.rb

@@ -7,7 +7,7 @@ class Dockly::AbstractCommand < Clamp::Command
 
   def execute
     if File.exist?(file)
-      Dockly.setup(file)
+      Dockly.load_file = file
     else
       raise 'Could not find a dockly file!'
     end
@@ -20,7 +20,7 @@ class Dockly::BuildCommand < Dockly::AbstractCommand
 
   def execute
     super
-    if package = Dockly::Deb.instances[package_name.to_sym]
+    if package = Dockly.debs[package_name.to_sym]
       if force? || !package.exists?
         package.build
       else
@@ -33,7 +33,7 @@ end
 class Dockly::ListCommand < Dockly::AbstractCommand
   def execute
     super
-    Dockly::Deb.instances.each_with_index do |(name, package), index|
+    Dockly.debs.each_with_index do |(name, package), index|
       puts "#{index + 1}. #{name}"
     end
   end

data/lib/dockly/rake_task.rb

@@ -3,10 +3,6 @@ require 'dockly'
 
 $rake_task_logger = Dockly::Util::Logger.new('[dockly rake_task]', STDOUT, false)
 
-if File.exist?('dockly.rb')
-  Dockly.setup
-end
-
 class Rake::DebTask < Rake::Task
   def needed?
     raise "Package does not exist" if package.nil?
@@ -30,7 +26,7 @@ namespace :dockly do
   end
 
   namespace :deb do
-    Dockly::Deb.instances.values.each do |inst|
+    Dockly.debs.values.each do |inst|
       deb inst.name => 'dockly:load' do |name|
         Thread.current[:rake_task] = name
         inst.build

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '0.0.2'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
+  prerelease: 
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,62 +46,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: dockly-util
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,99 +126,113 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Packaging made easy
@@ -258,26 +287,27 @@ files:
 homepage: https://github.com/swipely/dockly
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Packaging made easy
 test_files:
 - spec/dockly/aws_spec.rb
@@ -295,3 +325,4 @@ test_files:
 - spec/fixtures/test-2.tar.gz
 - spec/spec_helper.rb
 - spec/support/vcr.rb
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: fe48214f959251a622ec6458e33b73c9c75b4ac7
-  data.tar.gz: 3788dea01e592c04e702b8892e3b638dfcec2dc1
-SHA512:
-  metadata.gz: fcfb39baac628840756bc4f944570bf8b7be9713d3a627841ade18601971b1395848943538b8c48f3a4dcd610423adb03eb84552c887e658aab6fcc3a559de9b
-  data.tar.gz: d9075e08f45a02cfbb101b9e1ef590f43b8e9f7ea0de29aa59f51aa1e9739692b7ad62426e32549f70dd66100a7fc4c547e3e4fafa5c227a848ea1a334bcb11f