qcmd 0.1.3 → 0.1.4

data/bin/qcmd

@@ -9,6 +9,10 @@ opts = Trollop::options do
   version VERSION_STRING
   opt :verbose, 'Use verbose mode', :default => false
   opt :debug, "Show full debug output, don't make changes to workspaces", :default => false
+  opt :machine, "Automatically try to connect to the machine with the given name", :type => :string
+  opt :machine_passcode, "Use the given machine passcode", :type => :integer
+  opt :workspace, "Automatically try to connect to the workspace with the given name", :type => :string
+  opt :workspace_passcode, "Use the given workspace passcode", :type => :integer
 end
 
 if opts[:verbose]
@@ -26,6 +30,6 @@ Qcmd.ascii_qlab
 Qcmd.print
 Qcmd.print Qcmd.centered_text(VERSION_STRING)
 
-Qcmd::Network.browse_and_display
+Qcmd::Network.browse_and_display opts
 
 Qcmd::CLI.launch opts

data/lib/qcmd/cli.rb

@@ -16,21 +16,21 @@ module Qcmd
     end
 
     def initialize options={}
+      Qcmd.debug "(launching with options: #{options.inspect})"
       # start local listening port
       Qcmd.context = Qcmd::Context.new
 
       self.prompt = '> '
 
-      start
-
-      # if local machines have already been detected and only one is available,
-      # use it.
-      if Qcmd::Network.machines
-        if Qcmd::Network.machines.size == 1 && !Qcmd::Network.machines.first.passcode?
-          puts "AUTOCONNECT"
-          connect Qcmd::Network.machines.first, nil
+      if options[:machine_given]
+        Qcmd.debug "(autoconnecting to #{ options[:machine] })"
+        connect_to_machine_by_name options[:machine], options[:machine_passcode]
+        if options[:workspace_given]
+          connect_to_workspace_by_name options[:workspace], options[:workspace_passcode]
         end
       end
+
+      start
     end
 
     def connect machine, passcode
@@ -56,6 +56,23 @@ module Qcmd
       self.prompt = "#{ machine.name }> "
     end
 
+    def connect_to_machine_by_name machine_name, passcode
+      if machine = Qcmd::Network.find(machine_name)
+        print "connecting to machine: #{machine_name}"
+        connect machine, passcode
+      else
+        print 'sorry, that machine could not be found'
+      end
+    end
+
+    def connect_to_workspace_by_name workspace_name, passcode
+      if workspace = Qcmd.context.machine.find_workspace(workspace_name)
+        workspace.passcode = passcode
+        print "connecting to workspace: #{workspace_name}"
+        use_workspace workspace
+      end
+    end
+
     def use_workspace workspace
       Qcmd.debug %[(connecting to workspace: "#{workspace.name}")]
       # set workspace in context. Will unset later if there's a problem.
@@ -99,12 +116,7 @@ module Qcmd
         machine_name = args.shift
         passcode     = args.shift
 
-        if machine = Qcmd::Network.find(machine_name)
-          print "connecting to machine: #{machine_name}"
-          connect machine, passcode
-        else
-          print 'sorry, that machine could not be found'
-        end
+        connect_to_machine_by_name machine_name, passcode
       when 'disconnect'
         reset
         Qcmd::Network.browse_and_display
@@ -116,11 +128,7 @@ module Qcmd
 
         Qcmd.debug "(using workspace: #{ workspace_name.inspect })"
 
-        if workspace = Qcmd.context.machine.find_workspace(workspace_name)
-          workspace.passcode = passcode
-          print "connecting to workspace: #{workspace_name}"
-          use_workspace workspace
-        end
+        connect_to_workspace_by_name workspace_name, passcode
       when 'cues'
         if !Qcmd.context.workspace_connected?
           print "You must be connected to a workspace before you can view a cue list."

data/lib/qcmd/network.rb

@@ -27,9 +27,6 @@ module Qcmd
           naps += 1
 
           if machines.size != previous
-            Qcmd.print
-            Qcmd.print "Found #{ machines.size } QLab machine#{ machines.size == 1 ? '' : 's'}"
-            Qcmd.print
             previous = machines.size
           end
         end
@@ -37,9 +34,13 @@ module Qcmd
         Thread.kill(browse_thread) if browse_thread.alive?
       end
 
-      def display
+      def display options={}
         longest = machines.map {|m| m.name.size}.max
 
+        Qcmd.print
+        Qcmd.print "Found #{ machines.size } QLab machine#{ machines.size == 1 ? '' : 's'}"
+        Qcmd.print
+
         machines.each_with_index do |machine, n|
           if Qcmd.debug?
             Qcmd.print "#{ n + 1 }. %-#{ longest + 2 }s %s" % [machine.name, machine.client_string]
@@ -53,9 +54,11 @@ module Qcmd
         Qcmd.print
       end
 
-      def browse_and_display
+      def browse_and_display options={}
         browse
-        display
+        if options[:machine_given] && !find(options[:machine_name]).nil?
+          display options
+        end
       end
 
       def find machine_name

data/lib/qcmd/version.rb

@@ -1,3 +1,3 @@
 module Qcmd
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qcmd
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Adam Bachman