dtf 0.3.0 → 0.3.1

data/bin/dtf

@@ -6,8 +6,6 @@
 
 require 'dtf'
 
-@parser = Dtf::OptionsParser.new
-@cmd, @cmd_opts = @parser.parse_cmds # Parse the command-line, and return the cmd & its specific cmd_opts
+cmd, cmd_opts = Dtf::OptionsParser.new.parse_cmds(ARGV)
 
-@new_cmd = Dtf::Command.create_cmd(@cmd) # Create a command named after contents of @cmd var
-@new_cmd.execute(@cmd_opts) # Pass @cmd_opts to that command's execute method
+Dtf::Command.create_cmd(cmd, cmd_opts).execute # Create a command named after contents of @cmd var

data/lib/dtf.rb

@@ -7,16 +7,11 @@ module Dtf
   load "#{File.join(File.dirname(__FILE__), "/config/environment.rb")}"
   
   module Command
-    def self.create_cmd(cmd)
-      puts "#{@cmd}"
-      begin
-        new_cmd = Dtf::Command.const_get(cmd.camelize).new    
-      rescue NameError  
-        puts "DTF has no registered command by that name."
-        puts "Please see 'dtf -h' for the list of recognized commands."
-      else
-        return new_cmd
-      end
+    def self.create_cmd(cmd, options)
+      Dtf::Command.const_get(cmd.camelize).new(cmd, options)    
+    rescue NameError  
+      puts "DTF has no registered command by that name."
+      puts "Please see 'dtf -h' for the list of recognized commands."
     end
 
     # This sub-command is used to add a User to the Test Framework system
@@ -28,18 +23,23 @@ module Dtf
     # '--full-name' is the Real Name of the created User.
     # '--email-address' is the email address of the created User, and *must* be unique in the system.
     class CreateUser
-      def execute(cmd_opts)
-        if [:user_name_given, :full_name_given, :email_address_given].all? { |sym| cmd_opts.key?(sym) } then
-          user = User.where(user_name:     cmd_opts[:user_name],
-                             full_name:     cmd_opts[:full_name],
-                             email_address: cmd_opts[:email_address]).create
+      def initialize(cmd_name, options)
+        @cmd_name = cmd_name
+        @cmd_opts = options
+      end
+      
+      def execute
+        if [:user_name_given, :full_name_given, :email_address_given].all? { |sym| @cmd_opts.key?(sym) } then
+          user = User.where(user_name:     @cmd_opts[:user_name],
+                             full_name:     @cmd_opts[:full_name],
+                             email_address: @cmd_opts[:email_address]).create
 
           # Check to make sure user was actually saved to the db
           if user.persisted? then
-            puts "Created user \'#{cmd_opts[:user_name]}\' for \'#{cmd_opts[:full_name]}\'"
+            puts "Created user \'#{@cmd_opts[:user_name]}\' for \'#{@cmd_opts[:full_name]}\'"
           else
             # Oops, it wasn't! Notify user and display any error message(s)
-            $stderr.puts "ERROR: #{cmd_opts[:user_name].to_s} was NOT created! Please fix the following errors and try again:"
+            $stderr.puts "ERROR: #{@cmd_opts[:user_name].to_s} was NOT created! Please fix the following errors and try again:"
             user.errors.full_messages.each do |msg|
               $stderr.puts "#{msg}"
             end
@@ -47,7 +47,7 @@ module Dtf
             abort()
           end
         else
-          Dtf::ErrorSystem.raise_error(@cmd) # This error here is thrown when not all params are provided
+          Dtf::ErrorSystem.raise_error(@cmd_name) # This error here is thrown when not all params are provided
         end
       end
     end
@@ -66,18 +66,23 @@ module Dtf
     # This *optional* parameter is for providing a description of the Verification Suite's use.
     # e.g. --description "RSpec Verification"
     class CreateVs
-      def execute(cmd_opts)
-        if [:user_name_given, :name_given].all? { |sym| cmd_opts.key?(sym) } then
-          user = User.find_by_user_name(cmd_opts[:user_name])
-          vs   = user.verification_suites.create(name: cmd_opts[:name], description: cmd_opts[:description])
+      def initialize(cmd_name, options)
+        @cmd_name = cmd_name
+        @cmd_opts = options
+      end
+      
+      def execute
+        if [:user_name_given, :name_given].all? { |sym| @cmd_opts.key?(sym) } then
+          user = User.find_by_user_name(@cmd_opts[:user_name])
+          vs   = user.verification_suites.create(name: @cmd_opts[:name], description: @cmd_opts[:description])
           if vs.persisted? then
-            puts "VS named \'#{cmd_opts[:name]}\' allocated to user \'#{cmd_opts[:user_name]}\'"
+            puts "VS named \'#{@cmd_opts[:name]}\' allocated to user \'#{@cmd_opts[:user_name]}\'"
           else
             $stderr.puts "ERROR: Failed to save Verification Suite. Check DB logfile for errors"
             abort()
           end
         else
-          Dtf::ErrorSystem.raise_error(@cmd)
+          Dtf::ErrorSystem.raise_error(@cmd_name)
         end
       end
     end
@@ -99,15 +104,20 @@ module Dtf
     # This flag will find all Verification Suites owned by the user being deleted, and reassign them
     # to 'Library Owner' (user_name: library_owner) which is the generic in-house User shipped with DTF.
     class DeleteUser
-      def execute(cmd_opts)
-        if [:user_name_given, :delete_all].all? { |sym| cmd_opts.key?(sym) } then
+      def initialize(cmd_name, options)
+        @cmd_name = cmd_name
+        @cmd_opts = options
+      end
+      
+      def execute
+        if [:user_name_given, :delete_all].all? { |sym| @cmd_opts.key?(sym) } then
           # NOTE: :delete_all is 'true' by default. passing '--no-delete-all' sets it to false,
           # and adds the :delete_all_given key to the cmd_opts hash, set to true.
           # This means NOT to delete all VSs associated with this user. We delete them by default.
-          if cmd_opts[:delete_all] == false && cmd_opts[:delete_all_given] == true
+          if @cmd_opts[:delete_all] == false && @cmd_opts[:delete_all_given] == true
             puts "Called with '--no-delete-all' set! NOT deleting all owned VSs!"
             puts "Reassigning VSs to Library. New owner will be \'Library Owner\'"
-            user      = User.find_by_user_name(cmd_opts[:user_name])
+            user      = User.find_by_user_name(@cmd_opts[:user_name])
             lib_owner = User.find_by_user_name("library_owner")
             user.verification_suites.all.each do |vs|
               vs.user_id = lib_owner.id
@@ -115,8 +125,8 @@ module Dtf
             end
             User.delete(user)
           else
-            puts "Called with '--delete-all' set or on by default! Deleting all VSs owned by #{cmd_opts[:user_name]}"
-            user = User.find_by_user_name(cmd_opts[:user_name])
+            puts "Called with '--delete-all' set or on by default! Deleting all VSs owned by #{@cmd_opts[:user_name]}"
+            user = User.find_by_user_name(@cmd_opts[:user_name])
             if ! user.nil? then
               user.verification_suites.all.each do |vs|
                 VerificationSuite.delete(vs)
@@ -125,12 +135,12 @@ module Dtf
                 User.delete(user)
               end
             else
-              $stderr.puts "ERROR: No user named \'#{cmd_opts[:user_name].to_s}\' found!"
+              $stderr.puts "ERROR: No user named \'#{@cmd_opts[:user_name].to_s}\' found!"
               abort()
             end
           end
         else
-          Dtf::ErrorSystem.raise_error(@cmd)
+          Dtf::ErrorSystem.raise_error(@cmd_name)
         end
       end
     end
@@ -143,14 +153,19 @@ module Dtf
     # The '--user-name' parameter is the user_name of the User that owns the Verification Suite you wish to delete
     # The '--id' parameter is the ID # of the Verification Suite you wish to delete, as provided by @vs.id
     class DeleteVs
-      def execute(cmd_opts)
-        if [:user_name_given, :id_given].all? { |sym| cmd_opts.key?(sym) } then
-          puts "Deleting #{cmd_opts[:user_name]}\'s VS with ID \'#{cmd_opts[:id]}\'"
-          user = User.find_by_user_name(cmd_opts[:user_name])
-          vs   = user.verification_suites.find(cmd_opts[:id])
+      def initialize(cmd_name, options)
+        @cmd_name = cmd_name
+        @cmd_opts = options
+      end
+      
+      def execute
+        if [:user_name_given, :id_given].all? { |sym| @cmd_opts.key?(sym) } then
+          puts "Deleting #{@cmd_opts[:user_name]}\'s VS with ID \'#{@cmd_opts[:id]}\'"
+          user = User.find_by_user_name(@cmd_opts[:user_name])
+          vs   = user.verification_suites.find(@cmd_opts[:id])
           VerificationSuite.delete(vs)
         else
-          Dtf::ErrorSystem.raise_error(@cmd)
+          Dtf::ErrorSystem.raise_error(@cmd_name)
         end
       end
     end
@@ -194,7 +209,7 @@ module Dtf
     # and provides the help system for options/parameters.
     #
     # Returned Values: @cmd [Type: String] and @cmd_opts [Type: Hash]
-    def parse_cmds(arg=ARGV)
+    def parse_cmds(arg)
       # Global options default to '--version|-v' and '--help|-h'
       global_opts = Trollop::options do
         version "DTF v#{Dtf::VERSION}"
@@ -214,8 +229,8 @@ module Dtf
         stop_on SUB_COMMANDS
       end
 
-      @cmd = arg.shift
-      @cmd_opts = case @cmd
+      cmd = arg.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'})
@@ -244,7 +259,7 @@ module Dtf
         Trollop::die "Unknown DTF sub-command: #{@cmd.inspect}"
       end
       
-      return @cmd, @cmd_opts # Explicitly return @cmd and its @cmd_opts 
+      return cmd, cmd_opts # Explicitly return cmd and its cmd_opts 
     end
   end
   

data/lib/dtf/version.rb

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

data/spec/acceptance/verify_sub_commands.feature

@@ -10,11 +10,16 @@ Feature: Verify sub commands
     Given I execute 'create_user'
     Then I should find 'testuser' in the database
 
-  Scenario: Execution of delete_user succeeds
+  Scenario: Execution of delete_user succeeds ( WITHOUT setting --no-delete-all flag [Default] )
     send "I execute 'create_user'"
 	Given I execute 'delete_user'
 	Then I should not find 'testuser' in the database
 
+  Scenario: Execution of delete_user succeeds ( WITH setting --no-delete-all flag )
+    send "I execute 'create_user'"
+	Given I execute 'delete_user' setting --no-delete-all
+	Then I should not find 'testuser' in the database
+
   Scenario: Execution of create_vs succeeds
     send "I create 'create_user'"
     Given I execute 'create_vs'

data/spec/steps/feature_steps.rb

@@ -26,12 +26,11 @@ step "I execute 'create_user'" do
               email_address: "me@example.com",
               user_name_given: true,
               full_name_given: true,
-              email_address_given: true,
-              delete_all: true
+              email_address_given: true
               }
 
-  @new_cmd = Dtf::Command.create_cmd(@cmd)
-  @new_cmd.execute(@cmd_opts)
+  new_cmd = Dtf::Command.create_cmd(@cmd, @cmd_opts)
+  new_cmd.execute
 end
 
 step "I should find 'testuser' in the database" do
@@ -41,17 +40,31 @@ end
 
 step "I execute 'delete_user'" do
   send "I execute 'create_user'"
-end
 
-step "I should not find 'testuser' in the database" do
   @cmd = "delete_user"
   @cmd_opts = { user_name: "testuser",
-                delete_all_given: true,
                 user_name_given: true,
-                delete_all: false
+                delete_all: true
                 }
-  @new_cmd = Dtf::Command.create_cmd(@cmd)
-  @new_cmd.execute(@cmd_opts)
+  new_cmd = Dtf::Command.create_cmd(@cmd, @cmd_opts)
+  new_cmd.execute
+end
+
+step "I execute 'delete_user' setting --no-delete-all" do
+  send "I execute 'create_user'"
+
+  @cmd = "delete_user"
+  @cmd_opts = {user_name: "testuser", 
+              user_name_given: true,
+              delete_all: false,
+              delete_all_given: true
+              }
+
+  new_cmd = Dtf::Command.create_cmd(@cmd, @cmd_opts)
+  new_cmd.execute
+end
+
+step "I should not find 'testuser' in the database" do
 end
 
 step "I execute 'create_vs'" do
@@ -65,8 +78,9 @@ step "I execute 'create_vs'" do
               description_given: true
               }
 
-  @new_cmd = Dtf::Command.create_cmd(@cmd)
-  @new_cmd.execute(@cmd_opts)
+  new_cmd = Dtf::Command.create_cmd(@cmd, @cmd_opts)
+  new_cmd.execute
+
 end
 
 step "I should find a VS in the database" do
@@ -82,8 +96,8 @@ step "I execute 'delete_vs'" do
               user_name_given: true,
               id_given: true
               }
-  @new_cmd = Dtf::Command.create_cmd(@cmd)
-  @new_cmd.execute(@cmd_opts)
+  new_cmd = Dtf::Command.create_cmd(@cmd, @cmd_opts)
+  new_cmd.execute
 end
 
 step "I should not find a VS in the database" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dtf
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors: