dockly 3.1.1 → 3.2.0.pre.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODQyMjgwNGJkYWE2YThjOTI1OTAxZWRlZmY5ZmIyNThhOThjNWFkMQ==
+    N2MzMTNlNjU1OGM5MDJmY2M5MDYxNzk2YjA0OGIyMTVhZmNlNTBkYQ==
   data.tar.gz: !binary |-
-    MjgxMDZlMTFmN2QxODZlYTJmZjRlZTJlMzlmNmJmNDA2ODZmNmRmNw==
+    MzRhMzcwZTNjYTRmYjFjODk3NTNjNWZjZDJiMGE3YmE2OGE4NjU2Mw==
 SHA512:
   metadata.gz: !binary |-
-    NDk1ZjAzYmU3MGI3Njk0NDM5MDBkNWNhM2UyMWFiOGZmNDI5OGQ4MDA2Y2Zm
-    MjE2MzYzOThkYzg1MzZkNTZjZTM0MjEwY2I1ZGMwZTM1OTY4MTQ5ZTk0MTZi
-    ZGQyYzM4ODg2YjgyMmE4ZDYxMDIwZDY3ZDM3MGQyYmFkNDIyMTE=
+    NzNmMjE0ZWE2NmI1OTcxOTNhZTY1MzU0NzhlNGRmYTQwMzc2NWNhOGYwZWRm
+    ZDljZGI3ODZiYjdkZjI3MzM2NzAwODM1ZDEwYjU1MjIzOGQ5YzQ2OWRlMjg0
+    MWNjNjBlMGI0M2NkYTBjNmI4ZmI1ZjZlYTcxZjBlY2I0MmViMDU=
   data.tar.gz: !binary |-
-    MmM2YTFhODIzZWE3MTFlOWY4YTgyMGNlNzZkMWJiZmYxNDIzOTkxMTk1ZjMw
-    MTQxOTE2ODA2NjM4OGFiNjhlNGQyOTk2YWM1OTQ0ZDRhNzZkYjNhNmRhNDIz
-    NTg2ZjI1NTc5MWM3MzU3ZWFkNGJjZWUwZTVkYTA2MjQzMTg4ZTA=
+    NDQwYWNkOWViYWFmZDg3NzljNGMyM2VmNjc0NGZhOTUyMDQ0Yjc4MTlmMDRj
+    NDQzNzVjMjEyMjBjODllMmJkOWY4ZDE4NGQ1NjIxZWMyZjQzZTUzZjg3NDU1
+    NWVhMTRlYjg1NWVjMmQ1MDMzNDNhOTA2NDQ5MjNiZGQzYTlmNGQ=

data/lib/dockly.rb

@@ -10,8 +10,9 @@ require 'open3'
 module Dockly
   LOAD_FILE = 'dockly.rb'
 
-  attr_reader :instance, :git_sha
-  attr_writer :load_file
+  class << self
+    attr_writer :load_file
+  end
 
   autoload :Foreman, 'dockly/foreman'
   autoload :BashBuilder, 'dockly/bash_builder'
@@ -30,7 +31,7 @@ module Dockly
     @load_file || LOAD_FILE
   end
 
-  def inst
+  def instance
     @instance ||= load_inst
   end
 
@@ -82,7 +83,7 @@ module Dockly
 
   [:debs, :rpms, :dockers, :foremans].each do |method|
     define_method(method) do
-      inst[method]
+      instance[method]
     end
 
     module_function method
@@ -96,7 +97,7 @@ module Dockly
   }.each do |method, klass|
     define_method(method) do |sym, &block|
       if block.nil?
-        inst[:"#{method}s"][sym]
+        instance[:"#{method}s"][sym]
       else
         klass.new!(:name => sym, &block)
       end

data/lib/dockly/cli.rb

@@ -14,17 +14,40 @@ class Dockly::AbstractCommand < Clamp::Command
   end
 end
 
-class Dockly::BuildCommand < Dockly::AbstractCommand
+class Dockly::BuildOrCopyAllCommand < Dockly::AbstractCommand
+  def execute
+    super
+    Rake::Task["dockly:build_or_copy_all"].invoke
+  end
+end
+
+class Dockly::BuildDebCommand < Dockly::AbstractCommand
+  parameter 'PACKAGE', 'the name to build the package for', :attribute_name => :package_name
+  option ['-n', '--no-export'], :flag, 'do not export', :default => false, :attribute_name => :noexport
+
+  def execute
+    super
+    if Dockly.debs[package_name.to_sym]
+      if noexport?
+        Rake::Task["dockly:deb:prepare"].invoke(package_name)
+      else
+        Rake::Task["dockly:deb:build"].invoke(package_name)
+      end
+    end
+  end
+end
+
+class Dockly::BuildRpmCommand < Dockly::AbstractCommand
   parameter 'PACKAGE', 'the name to build the package for', :attribute_name => :package_name
-  option ['-f', '--force'], :flag, 'force the package build', :default => false, :attribute_name => :force
+  option ['-n', '--no-export'], :flag, 'do not export', :default => false, :attribute_name => :noexport
 
   def execute
     super
-    if package = Dockly.debs[package_name.to_sym]
-      if force? || !package.exists?
-        package.build
+    if Dockly.rpms[package_name.to_sym]
+      if noexport?
+        Rake::Task["dockly:rpm:prepare"].invoke(package_name)
       else
-        puts "Package already exists!"
+        Rake::Task["dockly:rpm:build"].invoke(package_name)
       end
     end
   end
@@ -32,20 +55,15 @@ end
 
 class Dockly::DockerCommand < Dockly::AbstractCommand
   parameter 'DOCKER', 'the name to generate the docker image for', :attribute_name => :docker_name
-  option ['-f', '--force'], :flag, 'force the package build', :default => false, :attribute_name => :force
   option ['-n', '--no-export'], :flag, 'do not export', :default => false, :attribute_name => :noexport
 
   def execute
     super
-    if docker = Dockly.dockers[docker_name.to_sym]
-      if force? || !docker.exists?
-        if noexport?
-          docker.generate_build
-        else
-          docker.generate!
-        end
+    if Dockly.dockers[docker_name.to_sym]
+      if noexport?
+        Rake::Task["dockly:docker:prepare"].invoke(docker_name)
       else
-        puts "Package already exists!"
+        Rake::Task["dockly:docker:build"].invoke(docker_name)
       end
     end
   end
@@ -56,6 +74,7 @@ class Dockly::ListCommand < Dockly::AbstractCommand
     super
     dockers = Dockly.dockers.dup
     debs = Dockly.debs
+    rpms = Dockly.rpms
 
     puts "Debs" unless debs.empty?
     debs.each_with_index do |(name, package), index|
@@ -66,6 +85,15 @@ class Dockly::ListCommand < Dockly::AbstractCommand
       end
     end
 
+    puts "RPMs" unless rpms.empty?
+    rpms.each_with_index do |(name, package), index|
+      puts "#{index + 1}. #{name}"
+      if package.docker
+        dockers.delete(package.docker.name)
+        puts " - Docker: #{package.docker.name}"
+      end
+    end
+
     puts "Dockers" unless dockers.empty?
     dockers.each_with_index do |(name, docker), index|
       puts "#{index + 1}. #{name}"
@@ -104,7 +132,10 @@ class Dockly::BuildCacheCommand < Dockly::AbstractCommand
 end
 
 class Dockly::Cli < Dockly::AbstractCommand
-  subcommand ['build', 'b'], 'Create package', Dockly::BuildCommand
+  subcommand ['build-or-copy-all'], 'Run build or copy all Rake task', Dockly::BuildOrCopyAllCommand
+  subcommand ['build', 'b'], 'Create deb package', Dockly::BuildDebCommand
+  subcommand ['build-deb', 'bd'], 'Create deb package', Dockly::BuildDebCommand
+  subcommand ['build-rpm', 'br'], 'Create RPM package', Dockly::BuildRpmCommand
   subcommand ['docker', 'd'], 'Generate docker image', Dockly::DockerCommand
   subcommand ['list', 'l'], 'List packages', Dockly::ListCommand
   subcommand ['build_cache', 'bc'], 'Build Cache commands', Dockly::BuildCacheCommand

data/lib/dockly/rake_task.rb

@@ -34,7 +34,7 @@ namespace :dockly do
 
   task :load do
     raise "No #{Dockly.load_file} found!" unless File.exist?(Dockly.load_file)
-    Dockly.inst
+    Dockly.instance
   end
 
   task :assume_role => 'dockly:load' do

data/lib/dockly/version.rb

@@ -1,8 +1,8 @@
 module Dockly
   MAJOR = 3
-  MINOR = 1
-  PATCH = 1
-  RELEASE = nil
+  MINOR = 2
+  PATCH = 0
+  RELEASE = 'pre.1'
 
   VERSION = [MAJOR, MINOR, PATCH, RELEASE].compact.join('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0.pre.1
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -305,9 +305,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.2