locd 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c5204f4e2f4bcd01e4af0c6532c1505b117cadd
-  data.tar.gz: 7268adf8c6b457a0ea347fede69c923202baba32
+  metadata.gz: 21e58280d1931b02f58ba82b427ad422db7ff696
+  data.tar.gz: 47f847da55d407db080e0b999cb6882898d12940
 SHA512:
-  metadata.gz: e6d3f99a7a47678345bdfd2785c56e48cd291b026a9c215be9bfdd6117fafbad96cd2d4a65225b1b3feb48f04219c9d8b31ddd5a8c0a10f6ef3ebd4eb4c83364
-  data.tar.gz: '029dae728f2d37236167b21e6ff03c35289cace83e38d18a59fea4f1f71f66a2dfd274e1f1a87eebb1bcaa88106a67acf7fd78606459816288f3d822ba6010a5'
+  metadata.gz: cae7b8aaf1e7e03cc802ae6155e04a388bb7269203e5c002ea54e0de7667130e33149493df5b0f631c7dfcd2aaae1667cf2f87bfd2cf3021d4966cd4493f5bf5
+  data.tar.gz: d994ec75280c5e302844f119097f2ced9802ba5d558f57488eb661092548dca4be7a542075b3afe08bae82556c19693612bc6480ec94bc1cfc929cb09cef23c3

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/exe/locd

@@ -6,10 +6,10 @@ require 'locd'
 
 # Setup logging *before* including {Locd::CLI} so that we can get
 # trace/debug output from that setup if enabled via ENV vars
-NRSER::Logging.setup! application: 'Locd', dest: $stderr, sync: true
+NRSER::Log.setup_for_cli! application: 'Locd', dest: $stderr, sync: true
 
 # Logger for this file
-logger = SemanticLogger[__FILE__]
+logger = NRSER::Log[__FILE__]
 
 require 'locd/cli'
 

data/lib/locd.rb

@@ -29,12 +29,6 @@ require 'locd/agent'
 require 'locd/proxy'
 
 
-# Refinements
-# =======================================================================
-
-using NRSER
-
-
 # Definitions
 # =======================================================================
 
@@ -57,7 +51,7 @@ module Locd
   # ============================================================================
   
   # Add {.logger} and {#logger} methods
-  include NRSER::Logging::Mixin
+  include NRSER::Log::Mixin
   
   
   # Module Methods

data/lib/locd/agent.rb

@@ -18,7 +18,7 @@ require 'fileutils'
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 
@@ -51,7 +51,7 @@ class Locd::Agent
   # ==========================================================================
   
   # Add {.logger} and {#logger} methods
-  include NRSER::Logging::Mixin
+  include NRSER::Log::Mixin
   
   # Make agents sortable by label
   include Comparable
@@ -264,6 +264,20 @@ class Locd::Agent
   end
   
   
+  # Does this agent exist?
+  # 
+  # @param [String] label
+  #   Agent's label (AKA name AKA domain).
+  # 
+  # @return [Boolean]
+  # 
+  def self.exists? label
+    File.exists? plist_abs_path( label )
+  end # .exists?
+  
+  singleton_class.send :alias_method, :exist?, :exists?
+  
+  
   # All {Locd::Agent} that are instances of `self`.
   # 
   # So, when invoked through {Locd::Agent.all} returns all agents.
@@ -633,6 +647,29 @@ class Locd::Agent
   end # .add
   
   
+  # Pretty much what the name says.
+  # 
+  # @see .add
+  # @see #update
+  # 
+  # @param [String] label
+  #   Agent's label (AKA name AKA domain).
+  # 
+  # @param **values
+  #   Agent properties.
+  # 
+  # @return [Array<((:add | :update), Locd::Agent)]
+  #   Whether the agent was added or updated, followed by the agent instance.
+  # 
+  def self.add_or_update label:, **values
+    if exists? label
+      [:update, get( label ).update( **values )]
+    else
+      [:add, add( label: label, **values )]
+    end
+  end
+  
+  
   # Attributes
   # ============================================================================
   

data/lib/locd/agent/job.rb

@@ -4,7 +4,7 @@
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 

data/lib/locd/agent/proxy.rb

@@ -18,7 +18,7 @@ require 'fileutils'
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 

data/lib/locd/agent/rotate_logs.rb

@@ -18,7 +18,7 @@ require 'fileutils'
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 

data/lib/locd/agent/site.rb

@@ -18,7 +18,7 @@ require 'fileutils'
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 
@@ -126,7 +126,8 @@ class Locd::Agent::Site < Locd::Agent
                               keep_alive: false,
                               run_at_load: false,
                               port: nil,
-                              bind: Locd.config[:site, :bind]
+                              bind: Locd.config[:site, :bind],
+                              open_path: '/'
     # Allocate a port if one was not provided
     port = if port.nil?
       Locd::Proxy.allocate_port
@@ -135,6 +136,8 @@ class Locd::Agent::Site < Locd::Agent
       port.to_i
     end
     
+    open_path = "/#{ path }" unless open_path.start_with? '/'
+    
     super cmd_template: cmd_template,
           label: label,
           workdir: workdir,
@@ -143,7 +146,8 @@ class Locd::Agent::Site < Locd::Agent
           run_at_load: run_at_load,
           # Extras specific to {Locd::Agent::Site}:
           port: port,
-          bind: bind
+          bind: bind,
+          open_path: open_path
   end # .create_plist_data
   
   
@@ -163,10 +167,15 @@ class Locd::Agent::Site < Locd::Agent
   end
   
   
+  def open_path
+    config['open_path'] || '/'
+  end
+  
+  
   # @return [String]
   #   The URL the agent can be reached at through the proxy.
   def url
-    "http://#{ label }:#{ Locd::Proxy.port }"
+    "http://#{ label }:#{ Locd::Proxy.port }#{ open_path }"
   end
   
   # @!endgroup Instance Methods: Attribute Readers

data/lib/locd/agent/system.rb

@@ -4,7 +4,7 @@
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 

data/lib/locd/cli/command.rb

@@ -6,4 +6,5 @@ require_relative './command/site'
 require_relative './command/job'
 require_relative './command/proxy'
 require_relative './command/rotate_logs'
+require_relative './command/project'
 require_relative './command/main'

data/lib/locd/cli/command/agent.rb

@@ -16,7 +16,7 @@
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 
@@ -339,6 +339,9 @@ class Locd::CLI::Command::Agent < Locd::CLI::Command::Base
   
   def rm            pattern
     kwds = option_kwds :logs
+    
+    logger.debug "kwds", kwds
+    
     find_multi!( pattern ).each { |agent| agent.remove **kwds }
   end
   

data/lib/locd/cli/command/base.rb

@@ -18,7 +18,7 @@ require 'thor'
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 

data/lib/locd/cli/command/job.rb

@@ -5,7 +5,7 @@
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 

data/lib/locd/cli/command/main.rb

@@ -16,7 +16,7 @@
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 
@@ -128,7 +128,7 @@ class Locd::CLI::Command::Main < Locd::CLI::Command::Base
         }.to_sym
       end
       
-      NRSER::Logging.level = level unless level.nil?
+      NRSER::Log.level = level unless level.nil?
       
       if levels = Locd.config[:log, :levels]
         levels.each do |name, level|
@@ -151,8 +151,8 @@ class Locd::CLI::Command::Main < Locd::CLI::Command::Base
         end
       end
       
-      if [:trace, :debug].include? NRSER::Logging.level
-        logger.send NRSER::Logging.level, "Hello! We about to start the show..."
+      if [:trace, :debug].include? NRSER::Log.level
+        logger.send NRSER::Log.level, "Hello! We about to start the show..."
       end
     end
     
@@ -211,4 +211,10 @@ class Locd::CLI::Command::Main < Locd::CLI::Command::Base
   subcommand        'rotate_logs',
                     Locd::CLI::Command::RotateLogs
   
+  
+  desc              'project SUBCOMMAND...',
+                    'Manage Agent definitions for projects'
+  subcommand        'project',
+                    Locd::CLI::Command::Project
+  
 end # class Locd::CLI::Command::Main

data/lib/locd/cli/command/project.rb

@@ -0,0 +1,90 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+
+
+# Refinements
+# =======================================================================
+
+require 'nrser/refinements/types'
+using NRSER::Types
+
+
+# Definitions
+# =======================================================================
+
+# Manage Agent definitions attached to projects.
+# 
+module Locd
+module CLI
+module Command
+class Project < Base
+  
+  # Instance Methods
+  # ========================================================================
+  
+  # @!group Command Instance Methods
+  # --------------------------------------------------------------------------
+  
+  desc      'load',
+            "Load project Agent definitions"
+  
+  option      :file,
+    aliases:  [ 'f' ],
+    type:     :string,
+    default:  './dev/locd.yaml'
+  def load
+    
+    file_path = options[:file].to_pn.expand_path
+    
+    unless file_path.file?
+      raise "Definition file not found at `#{ file_path }`"
+    end
+    
+    defs = YAML.load( file_path.read ).with_indifferent_access
+    
+    t.hash_(
+      keys: t.in(%w{agents sites jobs}),
+    ).check! defs
+    
+    {
+      agents: Locd::Agent,
+      sites:  Locd::Agent::Site,
+      jobs:   Locd::Agent::Job,
+    }.each do |key, agent_class|
+      if defs.key? key
+        logger.info "Adding or updating #{ key }..."
+        
+        defs[key].each do |label, values|
+          logger.info payload: {
+            values: values,
+            options: values.to_options,
+          }
+          
+          method, agent = agent_class.add_or_update \
+            label: label,
+            **values.
+              map { |key, value|
+                key = key.gsub '-', '_'
+                if key == 'cmd_template'
+                  value = value.squish
+                end
+                
+                [ key, value ]
+              }.
+              to_h.
+              to_options
+          
+          action = t.match method,
+            :add, 'added',
+            :update, 'updated'
+          
+          logger.info "Agent `#{ label }` #{ action }"
+        end # each label, values
+      end # if defs.key? key
+    end # each key, agent_class
+    
+  end
+  
+  # @!endgroup Command Instance Methods # ************************************
+  
+end; end; end; end # class Locd::CLI::Command::Site

data/lib/locd/cli/command/proxy.rb

@@ -18,7 +18,7 @@ require 'thor'
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 

data/lib/locd/cli/command/rotate_logs.rb

@@ -18,7 +18,7 @@ require 'thor'
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 

data/lib/locd/cli/command/site.rb

@@ -5,7 +5,7 @@
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 

data/lib/locd/cli/table.rb

@@ -16,7 +16,7 @@
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 
@@ -51,7 +51,6 @@ class Locd::CLI::Table
   # ============================================================================
   
   include Enumerable
-  include NRSER::Ext::Enumerable
   
   
   # Classes

data/lib/locd/config.rb

@@ -10,6 +10,9 @@ require 'pathname'
 
 # Deps
 # -----------------------------------------------------------------------
+require 'nrser'
+require 'nrser/core_ext/object'
+
 
 # Project / Package
 # -----------------------------------------------------------------------
@@ -18,7 +21,7 @@ require 'pathname'
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 

data/lib/locd/errors.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-# Refinements
-# =======================================================================
-
-using NRSER
-
 
 # Definitions
 # =======================================================================

data/lib/locd/label.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-# Refinements
-# =======================================================================
-
-using NRSER
-
 
 # Definitions
 # =======================================================================

data/lib/locd/launchctl.rb

@@ -17,7 +17,7 @@ require 'cmds'
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 
@@ -60,7 +60,7 @@ module Locd::Launchctl
   # ============================================================================
   
   # Add {.logger} method
-  include NRSER::Logging::Mixin
+  include NRSER::Log::Mixin
   
   
   # Classes

data/lib/locd/newsyslog.rb

@@ -18,7 +18,7 @@ require 'cmds'
 # Refinements
 # =======================================================================
 
-using NRSER
+require 'nrser/refinements/types'
 using NRSER::Types
 
 
@@ -29,7 +29,7 @@ using NRSER::Types
 # 
 module Locd::Newsyslog
   
-  include NRSER::Logging::Mixin
+  include NRSER::Log::Mixin
   
   
   # Default place to work out of.

data/lib/locd/pattern.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-# Refinements
-# =======================================================================
-
-using NRSER
-
 
 # Definitions
 # =======================================================================

data/lib/locd/proxy.rb

@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 # encoding: UTF-8
 
-# Refinements
-# =======================================================================
-
-using NRSER
-
 
 # Definitions
 # =======================================================================
@@ -43,7 +38,7 @@ module Locd::Proxy
   # ============================================================================
   
   # Add {.logger} and {#logger} methods
-  include NRSER::Logging::Mixin
+  include NRSER::Log::Mixin
   
   
   # Module Methods

data/lib/locd/util.rb

@@ -1,23 +1,5 @@
 # frozen_string_literal: true
-
-# Requirements
-# =======================================================================
-
-# Stdlib
-# -----------------------------------------------------------------------
-
-# Deps
-# -----------------------------------------------------------------------
-
-# Project / Package
-# -----------------------------------------------------------------------
-
-
-# Refinements
-# =======================================================================
-
-using NRSER
-
+# encoding: UTF-8
 
 # Definitions
 # =======================================================================

data/locd.gemspec

@@ -47,7 +47,7 @@ Gem::Specification.new do |spec|
   # ----------------------------------------------------------------------------
   
   # My guns
-  spec.add_dependency "nrser", '~> 0.2.1'
+  spec.add_dependency "nrser", '~> 0.3.1'
   
   # Used to process command templates from projects' `//dev/locd.yml` files
   spec.add_dependency "cmds", ">= 0.2.10"
@@ -59,7 +59,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'plist', '~> 3.4'
   
   # Atli, my fork of Thor for CLI interface
-  spec.add_dependency 'atli', '>= 0.1.5'
+  spec.add_dependency 'atli', '~> 0.1.6'
   
   # 
   # spec.add_dependency 'terminal-table', '~> 1.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locd
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: cmds
   requirement: !ruby/object:Gem::Requirement
@@ -168,16 +168,16 @@ dependencies:
   name: atli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
 description: 
 email:
 - neil@ztkae.com
@@ -217,6 +217,7 @@ files:
 - lib/locd/cli/command/base.rb
 - lib/locd/cli/command/job.rb
 - lib/locd/cli/command/main.rb
+- lib/locd/cli/command/project.rb
 - lib/locd/cli/command/proxy.rb
 - lib/locd/cli/command/rotate_logs.rb
 - lib/locd/cli/command/site.rb