dtf 0.2.6 → 0.2.7

data/lib/dtf/error_system.rb

@@ -1,16 +1,16 @@
 # encoding: UTF-8
 # Reusable error response method
-def raise_error
+def raise_error(cmd)
   raise ArgumentError
 rescue
-  $stderr.puts "ERROR! #{@cmd} did not receive all required options."
-  $stderr.puts "See 'dtf #{@cmd} -h' for help with this sub-command"
+  $stderr.puts "ERROR! #{cmd} did not receive all required options."
+  $stderr.puts "See 'dtf #{cmd} -h' for help with this sub-command"
 
   # Set non-zero exit value on error, for scripting use.
   abort()
 end
 
-def display_errors()
+def display_errors(cmd)
   # TODO: Refactor error display to take sub-command as an arg
   # and display obj.errors.messages.each properly for each arg type.
 end

data/lib/dtf/help_system.rb

@@ -2,54 +2,58 @@
 # DTF Help System
 require 'trollop' # Used to implement help system
 
+module Dtf::HelpSystem
+
+# List of all sub-commands known within the Help System
 SUB_COMMANDS = %w(create_user delete_user create_vs delete_vs)
 
-# Global options default to '--version|-v' and '--help|-h'
-global_opts = Trollop::options do
-  version "DTF v#{Dtf::VERSION}"
-  banner <<-EOS
-  #{version}
-  (c) Copyright 2012 David Deryl Downey / Deryl R. Doucette. All Rights Reserved.
-  This is free software; see the LICENSE file for copying conditions.
-  There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  # Global options default to '--version|-v' and '--help|-h'
+  global_opts = Trollop::options do
+    version "DTF v#{Dtf::VERSION}"
+    banner <<-EOS
+    #{version}
+    (c) Copyright 2012 David Deryl Downey / Deryl R. Doucette. All Rights Reserved.
+    This is free software; see the LICENSE file for copying conditions.
+    There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-  Usage:
-        dtf -v|--version -h|--help [[sub_cmds <options>] -h|--help]
+    Usage:
+          dtf -v|--version -h|--help [[sub_cmds <options>] -h|--help]
   
-  Valid [sub_cmds] are: create_(user|vs), delete_(user|vs)
-  See 'dtf [sub_cmd] -h' for each sub_cmd's details and options
+    Valid [sub_cmds] are: create_(user|vs), delete_(user|vs)
+    See 'dtf [sub_cmd] -h' for each sub_cmd's details and options
     
-EOS
-  stop_on SUB_COMMANDS
-end
+  EOS
+    stop_on SUB_COMMANDS
+  end
 
-# Sub-commands go here
-@cmd = ARGV.shift
-@cmd_opts = case @cmd
-  when "create_user"
-    Trollop::options do
-      opt(:user_name, desc="Username for new TF user - REQUIRED", opts={:type => :string, :short => '-u'})
-      opt(:full_name, desc="Real name for new TF user - REQUIRED", opts={:type => :string, :short => '-n'})
-      opt(:email_address, desc="Email address for new TF user - REQUIRED", opts={:type => :string, :short => '-e'})
-    end
-  when "create_vs"
-    Trollop::options do
-      opt(:user_name, desc="TF user to associate this VS with - REQUIRED", opts={:type => :string, :short => '-u'})
-      opt(:name, desc="Name for new VS - REQUIRED", opts={:type => :string, :short => '-n'})
-      opt(:description, desc="Description of VS's intended use - OPTIONAL", opts={:type => :string, :short => '-d', :default => ''})
-    end
-  when "delete_user"
-    Trollop::options do
-      opt(:user_name, desc="Username of TF user to delete - REQUIRED", opts={:type => :string, :short => '-u'})
-      opt(:delete_all, desc="Delete _all_ VSs this user owns", :type => :flag, :default => true)
+  @cmd = ARGV.shift
+  @cmd_opts = case @cmd
+    when "create_user"
+      Trollop::options do
+        opt(:user_name, desc="Username for new TF user - REQUIRED", opts={:type => :string, :short => '-u'})
+        opt(:full_name, desc="Real name for new TF user - REQUIRED", opts={:type => :string, :short => '-n'})
+        opt(:email_address, desc="Email address for new TF user - REQUIRED", opts={:type => :string, :short => '-e'})
+      end
+    when "create_vs"
+      Trollop::options do
+        opt(:user_name, desc="TF user to associate this VS with - REQUIRED", opts={:type => :string, :short => '-u'})
+        opt(:name, desc="Name for new VS - REQUIRED", opts={:type => :string, :short => '-n'})
+        opt(:description, desc="Description of VS's intended use - OPTIONAL", opts={:type => :string, :short => '-d', :default => ''})
+      end
+    when "delete_user"
+      Trollop::options do
+        opt(:user_name, desc="Username of TF user to delete - REQUIRED", opts={:type => :string, :short => '-u'})
+        opt(:delete_all, desc="Delete _all_ VSs this user owns", :type => :flag, :default => true)
+      end
+    when "delete_vs"
+      Trollop::options do
+        opt(:user_name, desc="Username of VS owner - REQUIRED", opts={:type => :string, :short => '-u'})
+        opt(:id, desc="ID of VS to be deleted - REQUIRED", opts={:type => :int, :short => '-i'})
+      end
+    when nil
+      Trollop::die "No command specified! Please specify an applicable command"
+    else
+      Trollop::die "Unknown DTF sub-command: #{@cmd.inspect}"
     end
-  when "delete_vs"
-    Trollop::options do
-      opt(:user_name, desc="Username of VS owner - REQUIRED", opts={:type => :string, :short => '-u'})
-      opt(:id, desc="ID of VS to be deleted - REQUIRED", opts={:type => :int, :short => '-i'})
-    end
-  when nil
-    Trollop::die "No command specified! Please specify an applicable command"
-  else
-    Trollop::die "Unknown DTF sub-command: #{@cmd.inspect}"
-  end
+
+end

data/lib/dtf/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Dtf
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dtf
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+date: 2012-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -302,7 +302,8 @@ files:
 - doc/AnalysisCase.html
 - doc/CaseTest.html
 - doc/Dtf.html
-- doc/Dtf/DtfCommands.html
+- doc/Dtf/Command.html
+- doc/Dtf/HelpSystem.html
 - doc/User.html
 - doc/VerificationSuite.html
 - doc/_index.html