locd 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a80b05b88b98cb4d9d9706a2c095d1deed6bf26
-  data.tar.gz: f1dbf2a61964710164b273a9fdca8b2f75e2a224
+  metadata.gz: f6438af1b2410389af392d28a64141b6dd028c38
+  data.tar.gz: 2def809840b2b7be95a91c892fa04643da9e574d
 SHA512:
-  metadata.gz: 8a299efd70c86e066b4ad85e602165ed724a1e4a1c971e1d4a3f1dfebeaf7b44fc33c2e6a5f20c09d66d04eb7bf18753ad8b494f3354409ce28b6bf3b98fc561
-  data.tar.gz: 72316baf20c6f65cad87f53b21027e43a6de38839bd4b280c837c1433cd41bf9aa5360665e85a5373e3b5f8df4e85528f6a095f009cb013b310b52e8c4a42163
+  metadata.gz: f3cd7af583a45013c1fa5528f7b99a8bd9977dcc4c8f104618df2bdbf2e48c43d7616c8f2593d3a72452ba04fa02bdf27a54c9a95346282a3c4ba7088015a091
+  data.tar.gz: d3fe5aea5eaa00f5bc881204443fc356a344585300a4e75c78af10493b2c21ce91271e6de9ae89017ad66de2ab33eb9d99b0bf72b65177e636445c5c79beb02b

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

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

@@ -107,7 +107,8 @@ class Locd::CLI::Command::Agent < Locd::CLI::Command::Base
   
   shared_option :long,
     groups: :respond_with_agents,
-    desc: "Display agent details",
+    group: "Display",
+    desc: "Display agent details table",
     aliases: '-l',
     type: :boolean
   
@@ -149,6 +150,7 @@ class Locd::CLI::Command::Agent < Locd::CLI::Command::Base
   
   shared_option :all,
     groups: :multi,
+    group: "Pattern",
     desc: "Apply to ALL agents that PATTERN matches",
     aliases: '-a',
     type: :boolean
@@ -209,6 +211,31 @@ class Locd::CLI::Command::Agent < Locd::CLI::Command::Base
     default: true
   
   
+  # `:start` Group
+  # --------------------------------------------------------------------------
+  # 
+  # Relevant options when starting agents.
+  # 
+  
+  shared_option     :load,
+                    groups: :start,
+                    desc: "Load the agent before starting",
+                    type: :boolean,
+                    default: true
+  
+  shared_option     :force,
+                    groups: :start,
+                    desc: "Force loading of agent even if it's disabled",
+                    type: :boolean,
+                    default: false
+  
+  shared_option     :enable,
+                    groups: :start,
+                    desc: "Set `launchd` *Disabled* key to `false`",
+                    type: :boolean,
+                    default: false
+  
+  
   # Commands
   # ============================================================================
   
@@ -234,7 +261,7 @@ class Locd::CLI::Command::Agent < Locd::CLI::Command::Base
   end
   
   
-  desc              "plist PATTERN",
+  desc              "plist PATTERN [OPTIONS]",
                     "Print an agent's launchd property list"
   
   include_options   groups: :pattern
@@ -267,44 +294,7 @@ class Locd::CLI::Command::Agent < Locd::CLI::Command::Base
   # Commands for Manipulating Agent Definitions
   # ----------------------------------------------------------------------------
   
-  desc              "add CMD_TEMPLATE...",
-                    "Add an agent that runs a command in the current directory"
-   
-  include_options   groups: [:write, :add, :respond_with_agents]
-  
-  def add           *cmd_template, **kwds
-    logger.trace __method__.to_s,
-      cmd_template: cmd_template,
-      kwds: kwds,
-      options: options
-    
-    # Merge all the keywords together into the format needed to call
-    # {Locd::Agent.add}
-    kwds.merge! **option_kwds( :force, groups: [:write] ),
-                cmd_template: cmd_template
-    
-    # Check args
-    
-    # `:cmd_template` can not be empty at this point
-    if kwds[:cmd_template].empty? || kwds[:cmd_template].all?( &:empty? )
-      raise Thor::RequiredArgumentMissingError,
-        "CMD_TEMPLATE argument is required to add an agent"
-    end
-    
-    # Need a `:label` too
-    unless t.non_empty_str === kwds[:label]
-      raise Thor::RequiredArgumentMissingError,
-        "--label=LABEL option is required to add an agent"
-    end
-    
-    # Do the add
-    agent = agent_class.add **kwds
-    
-    # Reload (unless we were told not to... usually you want to reload)
-    agent.reload if options[:load]
-    
-    respond agent
-  end
+  require_relative './agent/add'
   
   
   desc              "update PATTERN [OPTIONS] [-- CMD_TEMPLATE...]",
@@ -325,7 +315,7 @@ class Locd::CLI::Command::Agent < Locd::CLI::Command::Base
   end
   
   
-  desc              "rm PATTERN",
+  desc              "rm PATTERN [OPTIONS]",
                     "Remove (uninstall, delete) a agent"
   
   map               remove: :rm
@@ -339,9 +329,6 @@ 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
   
@@ -349,35 +336,21 @@ class Locd::CLI::Command::Agent < Locd::CLI::Command::Base
   # Commands for Manipulating Agent State
   # --------------------------------------------------------------------------
   
-  desc              "start PATTERN",
+  desc              "start PATTERN [OPTIONS]",
                     "Start an agent"
   
-  include_options   groups: :pattern
-  
-  option            :load,
-                    desc: "Load the agent before starting",
-                    type: :boolean,
-                    default: true
-  
-  option            :force,
-                    desc: "Force loading of agent even if it's disabled",
-                    type: :boolean,
-                    default: false
-  
-  option            :enable,
-                    desc: "Set `launchd` *Disabled* key to `false`",
-                    type: :boolean,
-                    default: false
+  include_options   groups: [ :pattern, :multi, :start ]
   
   def start         pattern
-    find_only!( pattern ).start **option_kwds( :load, :force, :enable )
+    kwds = option_kwds :load, :force, :enable
+    find_mutli!( pattern ).each { |agent| agent.start **kwds }
   end
   
   
-  desc              "stop PATTERN",
+  desc              "stop PATTERN [OPTIONS]",
                     "Stop an agent"
   
-  include_options   groups: [:pattern, :stop]
+  include_options   groups: [:pattern, :multi, :stop]
   
   option            :unload,
                     desc: "Unload the agent from `launchd` after stopping",
@@ -390,11 +363,12 @@ class Locd::CLI::Command::Agent < Locd::CLI::Command::Base
                     default: false
   
   def stop          pattern
-    find_only!( pattern ).stop **option_kwds( :unload, :disable )
+    kwds = option_kwds :unload, :disable
+    find_multi!( pattern ).each { |agent| agent.stop **kwds }
   end
   
   
-  desc              "restart PATTERN",
+  desc              "restart PATTERN [OPTIONS]",
                     "Restart an agent"
   
   include_options   groups: [:pattern, :multi, :stop]
@@ -416,7 +390,6 @@ class Locd::CLI::Command::Agent < Locd::CLI::Command::Base
   
   def restart       pattern
     kwds = option_kwds :reload, :force, :enable
-    
     find_multi!( pattern ).each { |agent| agent.restart **kwds }
   end
   
@@ -424,14 +397,24 @@ class Locd::CLI::Command::Agent < Locd::CLI::Command::Base
   # Assorted Other Commands
   # ----------------------------------------------------------------------------
   
-  desc              "open PATTERN",
+  desc              "open PATTERN [OPTIONS]",
                     "Open an agent's URL in the browser"
   
-  include_options   groups: [:pattern, :multi]
+  include_options   groups: [ :pattern, :multi, :start ]
+  
+  option            :start,
+                    desc: %{ Start any stopped agents before opening },
+                    type: :boolean,
+                    default: true
   
   def open          pattern
     find_multi!( pattern ).each do |agent|
+      if options[:start] && agent.stopped?
+        agent.start **option_kwds( groups: :start )
+      end
+      
       Cmds! "open %s", agent.url
+      
       logger.info "Opened agent `#{ agent.label }` at #{ agent.url }"
     end
   end

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

@@ -0,0 +1,74 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+
+
+# Namespace
+# =======================================================================
+
+module  Locd
+module  CLI
+module  Command
+
+
+# Definitions
+# =======================================================================
+
+class Agent < Locd::CLI::Command::Base
+  
+  desc              "add [OPTIONS] -- CMD_TEMPLATE...",
+                    "Add an agent that runs a command in the current directory"
+  
+  example <<~END
+    Serve Yard docs for a Ruby gem in development
+    
+    Defines a Yard server working in the current directory that will be
+    available at http://yard.my_gem.test:8888 (unless Loc'd is running on a
+    different port than 8888).
+    
+        locd site add --name=yard.my_gem.test -- bundle exec yard server --reload --port {port} --bind {bind}
+    
+  END
+  
+  include_options   groups: [:write, :add, :respond_with_agents]
+  
+  def add *cmd_template, **kwds
+    logger.trace __method__.to_s,
+      cmd_template: cmd_template,
+      kwds: kwds,
+      options: options
+    
+    # Merge all the keywords together into the format needed to call
+    # {Locd::Agent.add}
+    kwds.merge! **option_kwds( :force, groups: [:write] ),
+                cmd_template: cmd_template
+    
+    # Check args
+    
+    # `:cmd_template` can not be empty at this point
+    if kwds[:cmd_template].empty? || kwds[:cmd_template].all?( &:empty? )
+      raise Thor::RequiredArgumentMissingError,
+        "CMD_TEMPLATE argument is required to add an agent"
+    end
+    
+    # Need a `:label` too
+    unless t.non_empty_str === kwds[:label]
+      raise Thor::RequiredArgumentMissingError,
+        "--label=LABEL option is required to add an agent"
+    end
+    
+    # Do the add
+    agent = agent_class.add **kwds
+    
+    # Reload (unless we were told not to... usually you want to reload)
+    agent.reload if options[:load]
+    
+    respond agent
+  end
+end
+
+# /Namespace
+# =======================================================================
+
+end # module  Command
+end # module  CLI
+end # module  Locd

data/locd.gemspec

@@ -47,7 +47,7 @@ Gem::Specification.new do |spec|
   # ----------------------------------------------------------------------------
   
   # My guns
-  spec.add_dependency "nrser", '~> 0.3.3'
+  spec.add_dependency "nrser", '~> 0.3.5'
   
   # 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.7'
+  spec.add_dependency 'atli', '~> 0.1.8'
   
   # 
   # 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.7
+  version: 0.1.8
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2018-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: cmds
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
 description: 
 email:
 - neil@ztkae.com
@@ -214,6 +214,7 @@ files:
 - lib/locd/cli.rb
 - lib/locd/cli/command.rb
 - lib/locd/cli/command/agent.rb
+- lib/locd/cli/command/agent/add.rb
 - lib/locd/cli/command/base.rb
 - lib/locd/cli/command/job.rb
 - lib/locd/cli/command/main.rb