qb 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1706ebb9f7e4d7c134e7f67a9754c0ecf4ae9fe1
-  data.tar.gz: 7d3191db5b5966d3979b4b6218de8ae6ea6ac6ef
+  metadata.gz: 023cb0a8d6ea38e59c77d21236f4c95944843093
+  data.tar.gz: 7d307bb9c37772b4dd06a0d9f1f3af694c5425d4
 SHA512:
-  metadata.gz: fda2a8f6ee9d7f9d19d7f67d73f140facabea56ea3e43ce32185b5076f108e8ac08e0704eff5123717a5adb9d6a09896b46a2c835d57a18db5a1fdfe40da3fa1
-  data.tar.gz: d8b507b8d96d3ec41b4642f399ea18ff0d2c8ec11eb8ff5387ea5742aaaccef0cb8a3757d4d2040b975bb0027bc9c19d6b8d1c57a4066fba5a786260ae3a8317
+  metadata.gz: 25520e571a52e90950dfff2263d4e57154900adb42f63fea546fa1967b175f45bdebd276145a5741f2001ebfbf1791b4065e28cda4b63588a70eeabc81a1cf53
+  data.tar.gz: 3de536eadddf790d77ea0d3e97af2a1d6c03c39d179e45bc96b259f3302ccf3d6eda933731d89f7f370558d02b7166744127712013af220ca40b305c428274e9

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/exe/qb

@@ -65,6 +65,9 @@ def main *args
   when 'root'
     puts QB::ROOT.to_s
     exit true
+  when 'version'
+    puts QB::VERSION
+    exit true
   else
     # default to `run` on the full args
     [:run, args]

data/lib/qb/ansible.rb

@@ -1,7 +1,9 @@
 
-module QB; end
-module QB::Ansible; end
+module QB
+module Ansible
+end
+end
 
 require_relative './ansible/config_file'
 require_relative './ansible/env'
-require_relative './ansible/cmds/playbook'
+require_relative './ansible/cmd/playbook'

data/lib/qb/ansible/{cmds → cmd}/playbook.rb

@@ -12,14 +12,20 @@ require 'qb/util/bundler'
 require 'qb/ipc/stdio/server'
 
 
-module QB; end
-module QB::Ansible; end
-module QB::Ansible::Cmds; end
+# Namespace
+# ========================================================================
 
+module  QB
+module  Ansible
+module  Cmd
+
+
+# Definitions
+# ========================================================================
 
 # A command object that runs a playbook with all the QB specialness.
 # 
-class QB::Ansible::Cmds::Playbook < ::Cmds
+class Playbook < Cmds
   DEFAULT_PLAYBOOK_PATH = '.qb-playbook.yml'
   
   # Default executable to use, just uses a bare `ansible-playbook`, letting
@@ -241,4 +247,12 @@ class QB::Ansible::Cmds::Playbook < ::Cmds
     
   # end protected
   
-end # class QB::Ansible::Playbook
+end # class Playbook
+
+
+# Namespace
+# ========================================================================
+
+end # module  Cmd
+end # module  Ansible
+end # module  QB

data/lib/qb/cli/play.rb

@@ -2,7 +2,7 @@
 # =====================================================================
 
 # package
-require 'qb/ansible/cmds/playbook'
+require 'qb/ansible/cmd/playbook'
 
 
 # Declarations
@@ -14,9 +14,9 @@ module QB; end
 # Definitions
 # =======================================================================
 
-module QB::CLI 
+module QB::CLI
   
-  # Play an Ansible playbook (like `state.yml`) in the QB environment 
+  # Play an Ansible playbook (like `state.yml`) in the QB environment
   # (sets up path env vars, IO streams, etc.).
   # 
   # @param [Array<String>] args
@@ -46,7 +46,7 @@ module QB::CLI
       raise_on_not_found: false
     
     # If we did find an Ansible config, we're going to want to run in that
-    # directory and add it to the role search path so that we merge it's 
+    # directory and add it to the role search path so that we merge it's
     # values into our env vars (otherwise they would override the config
     # values).
     unless ansible_cfg_path.nil?
@@ -54,7 +54,7 @@ module QB::CLI
       chdir = ansible_cfg_path.dirname
     end
     
-    cmd = QB::Ansible::Cmds::Playbook.new \
+    cmd = QB::Ansible::Cmd::Playbook.new \
       chdir: chdir,
       playbook_path: playbook_path
     

data/lib/qb/cli/run.rb

@@ -243,7 +243,7 @@ module QB::CLI
     # stick the role path in front to make sure we get **that** role
     env.roles_path.unshift role.path.expand_path.dirname
     
-    cmd = QB::Ansible::Cmds::Playbook.new \
+    cmd = QB::Ansible::Cmd::Playbook.new \
       env: env,
       playbook: playbook,
       role_options: options,

data/lib/qb/cli/setup.rb

@@ -5,7 +5,7 @@
 require 'pathname'
 
 # package
-require 'qb/ansible/cmds/playbook'
+require 'qb/ansible/cmd/playbook'
 
 
 # Refinements
@@ -24,7 +24,7 @@ module QB; end
 # Definitions
 # =======================================================================
 
-module QB::CLI 
+module QB::CLI
   
   # Play `//dev/setup.yml`
   # 
@@ -65,7 +65,7 @@ module QB::CLI
       raise "Can't find QB setup playbook at `#{ playbook_path.to_s }`"
     end
     
-    cmd = QB::Ansible::Cmds::Playbook.new \
+    cmd = QB::Ansible::Cmd::Playbook.new \
       chdir: project_root,
       extra_vars: {
         project_root: project_root,

data/lib/qb/docker/image.rb

@@ -44,25 +44,6 @@ class   Image < QB::Data::Immutable
   # ======================================================================
   
   
-  
-  
-  def self.with_name name, &block
-    block.call \
-      case name
-      when QB::Docker::Image::Name
-        name
-      when String
-        QB::Docker::Image::Name.from_s name
-      when Hash
-        QB::Docker::Image::Name.from_data name
-      else
-        raise NRSER::TypeError.new \
-          "Not sure what to do with ", name,
-          name: name
-      end
-  end
-  
-  
   def self.names **opts
     QB::Docker::CLI.image_names **opts
   end
@@ -84,11 +65,15 @@ class   Image < QB::Data::Immutable
     end
   end
   
+  private_class_method :run_cmd
+  
   
   def self.run_cmd! cmd, stream: true
     run_cmd cmd, stream: stream, raise_on_fail: true
   end
   
+  private_class_method :run_cmd!
+  
   
   def self.build! name:,
                   path:,
@@ -136,7 +121,8 @@ class   Image < QB::Data::Immutable
       pull: nil,
       build: nil,
       force: false,
-      push: false
+      push: false,
+      tags: []
     
     name = QB::Docker::Image::Name.from name
     
@@ -156,9 +142,7 @@ class   Image < QB::Data::Immutable
       logger.info "Forcing build...",
         name: name.to_s
         
-      build! name: name, **build
-      
-      QB::Docker::CLI.push?( name: name ) if push
+      build! name: name, push: push, tags: tags, **build
       
       return
     end
@@ -183,9 +167,7 @@ class   Image < QB::Data::Immutable
       name: name.to_s,
       path: build[:path]
     
-    build! name: name, **build
-    
-    QB::Docker::CLI.push( name: name ) if push
+    build! name: name, push: push, tags: tags, **build
     
   end # .ensure_present!
   

data/lib/qb/docker/image/name.rb

@@ -169,15 +169,20 @@ class   Name  < QB::Data::Immutable
   end # .exists?
   
   
+  def self.all
+    QB::Docker::CLI.image_names load: true, only_named: true
+  end
+  
+  
   # @see QB::Docker::CLI.image_names
   # 
-  +QB::Util::Decorators::NoPropsInKwds
-  def self.list *args, **opts
-    QB::Docker::CLI.image_names *args, **opts
+  def self.list **attrs
+    return all if attrs.empty?
+    
+    type = t.attrs attrs
+    all.select { |name| type === name }
   end # .list
   
-  singleton_class.send :alias_method, :all, :list
-  
   
   # Props
   # ======================================================================
@@ -208,6 +213,7 @@ class   Name  < QB::Data::Immutable
   #   @return [String?]
   #     String is non-empty.
   prop  :repository,
+        aliases: [ :repo ],
         type: t.non_empty_str?
   
   
@@ -217,6 +223,7 @@ class   Name  < QB::Data::Immutable
   #   @return [String?]
   #     String is non-empty.
   prop  :registry_server,
+        aliases: [ :reg ],
         type: t.non_empty_str?
   
   
@@ -238,8 +245,7 @@ class   Name  < QB::Data::Immutable
         source: :to_s
   
   
-  invariant t.attrs( registry_server: t.nil, port: t.nil ) |
-            t.attrs( registry_server: ~t.nil, port: ~t.nil )
+  invariant ~t.attrs( registry_server: t.nil, port: ~t.nil )
   
   
   # Instance Methods
@@ -272,7 +278,13 @@ class   Name  < QB::Data::Immutable
   
   
   def host
-    "#{ registry_server }:#{ port }" if registry_server && port
+    return unless registry_server
+    
+    if port
+      "#{ registry_server }:#{ port }"
+    else
+      registry_server
+    end
   end
   
   

data/lib/qb/package/version.rb

@@ -344,6 +344,11 @@ class   Version < QB::Util::Resource
   alias_method :dirty?, :build_dirty?
   
   
+  def level?
+    is_a? QB::Package::Version::Leveled
+  end
+  
+  
   # Derived Properties
   # ---------------------------------------------------------------------
   
@@ -417,9 +422,12 @@ class   Version < QB::Util::Resource
   
   # Return a new {QB::Package::Version} with build information added.
   # 
+  # 
+  # 
   # @return [QB::Package::Version]
   # 
   def build_version *build, branch: nil, ref: nil, time: nil, dirty: nil
+    build.map! &:to_s
     
     repo_segments = [
       branch,
@@ -428,12 +436,16 @@ class   Version < QB::Util::Resource
       (self.class.to_time_segment(time) if dirty && time),
     ].compact
     
-    if repo_segments.empty?
+    if build.empty? && repo_segments.empty?
       raise ArgumentError,
-            "Need to provide at least one of branch, ref, dirty."
+            "Need to provide at least one arg: build, branch, ref, dirty."
+    end
+    
+    unless repo_segments.empty?
+      build = [*build, repo_segments.join( '-' )]
     end
     
-    merge raw: nil, build: [*build, repo_segments.join( '-' )]
+    merge raw: nil, build: build
   end
   
   

data/lib/qb/package/version/from.rb

@@ -192,15 +192,17 @@ module QB::Package::Version::From
     
     identifier_for_ref = method :identifier_for
     
-    if source.include?( '-' ) && source.include?( '+' )
+    if  source.include?( '-' ) &&
+        source.include?( '+' ) &&
+        source.index( '-' ) < source.index( '+' )
       release_str, _, rest = source.partition '-'
       pre_str, _, build_str = rest.partition '+'
-    elsif source.include?( '-' )
-      release_str, _, pre_str = source.partition '-'
-      build_str = ''
     elsif source.include?( '+' )
       release_str, _, build_str = source.partition '+'
       pre_str = ''
+    elsif source.include?( '-' )
+      release_str, _, pre_str = source.partition '-'
+      build_str = ''
     else
       release_str = source
       pre_str = build_str = ''
@@ -303,4 +305,40 @@ module QB::Package::Version::From
     end
   end
   
+  
+  # Load a {QB::Package::Version} from a file.
+  # 
+  # Just reads the file and passes the contents to {.string}.
+  # 
+  # @param [String | Pathname | IO] file
+  #   File path or handle to read from.
+  # 
+  # @return [QB::Package::Version]
+  # 
+  def self.file path
+    string File.read( path )
+  end
+  
+  
+  
+  def self.repo repo_or_path, add_build: true
+    repo = t.match repo_or_path,
+      QB::Repo, repo_or_path,
+      t.path,   QB::Repo.method( :from_path )
+    
+    version_path = repo.root_path / 'VERSION'
+    file_version = file version_path
+    
+    if  add_build &&
+        file_version.level? &&
+        file_version.dev?
+      file_version.build_version \
+        branch: repo.branch,
+        ref: repo.head_short,
+        dirty: !repo.clean?
+    else
+      file_version
+    end
+  end
+  
 end # module QB::Package::Version::From

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -281,7 +281,7 @@ files:
 - lib/python/qb/strings.py
 - lib/qb.rb
 - lib/qb/ansible.rb
-- lib/qb/ansible/cmds/playbook.rb
+- lib/qb/ansible/cmd/playbook.rb
 - lib/qb/ansible/config_file.rb
 - lib/qb/ansible/env.rb
 - lib/qb/ansible/env/devel.rb