dtm 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf395d4e920a64bd54d96b9a1ce8fd43f9e972fe
-  data.tar.gz: ace8f79feafaea29ae66328fb6d458abd9931ac6
+  metadata.gz: 356f199bc9910cbf6bbd1f4f632ace987aa419ca
+  data.tar.gz: 338550eeb95a1b4e7fadf2dc9e69de49afcc17c4
 SHA512:
-  metadata.gz: 8de747d449ee92b2f2957040c8614376ecbec0619e79cc875ef8b1a2d01b959e3887bb8202d8fc02fdaf2ce3bd03d7ed4f4d0d387fff65cca19564835cf8b468
-  data.tar.gz: 78b05c5bc3dec9f245dc91544bdec340920fb2b8816be4d235852ce36b5d9ee4d69e5db92c1729656b651c9d7871b518439ab6c54d006bfd69e7e115aab3c9dd
+  metadata.gz: e9095d7631cbbb45f5f00c5678b735083e1ac56d5317f8bce5aa2ac0bf29ece7719bf6706abdd77048df06a768267b59b90422d438238388eca2a6e5a6b59b8f
+  data.tar.gz: b4f5e53e6256c7e22da7e0ba57b703ac6b67100fa92a0ab26bab3fe961ebdf1caa8528662c0f49799c51c7d4697e036c177a0bdf0ef592b002266e1e13e7a8b9

data/Rakefile

@@ -1,4 +1,8 @@
+require 'rubygems'
+require 'bundler/setup'
 require "bundler/gem_tasks"
 require 'rake/testtask'
 
-Rake::TestTask.new
+Rake::TestTask.new do |t|
+  t.libs << 'lib' << 'test'
+end

data/lib/dtm.rb

@@ -2,6 +2,7 @@ require "dtm/version"
 require "dtm/job"
 require 'dtm/schedule'
 require 'dtm/dtm'
+require 'dtm/task_desc'
 
 module Dtm
   # Your code goes here...

data/lib/dtm/dtm.rb

@@ -15,13 +15,13 @@ end
 module Dtm
   class Dtm
     def self.instance(data_store)
-      wttcl = 'C:\\Program Files\\Microsoft Driver Test Manager\\Studio\\wttcl.exe'
+      wttcl = 'C:\Program Files\Microsoft Driver Test Manager\Studio\wttcl.exe'
       return Dtm.new(wttcl, data_store) if File.exist?(wttcl)
 
-      wttcl = 'C:\\Program Files (x86)\\Microsoft Driver Test Manager\\Studio\\wttcl.exe'
+      wttcl = 'C:\Program Files (x86)\Microsoft Driver Test Manager\Studio\wttcl.exe'
       return Dtm.new(wttcl, data_store) if File.exist?(wttcl)
 
-      raise
+      raise 'ERROR: fail to find wttcl.exe'
     end
 
     def initialize(wttcl, data_store)
@@ -37,15 +37,13 @@ module Dtm
       Schedule.new(self, schedule_id)
     end
 
-    def machines(machine_pool)
-      self.set_machine_status(:machine_pool => machine_pool) do |stdout|
-        stdout.split("\n").collect {|line| line.scan(/\[\w+\]/) if line.match(/Machine \[\w+\] \(ID \d+\) is in \[\w+\] state./)}.compact
-      end
-    end
+    def machines(machine_pool, params = {})
+      params[:machine_pool] = machine_pool
+
+      self.set_machine_status(params) do |stdout|
+        raise stdout if stdout.match(/^ERROR:/)
 
-    def availabe_machines(params)
-      self.method_missing(:setmachinestatus, params) do |stdout|
-        stdout.split("\n").collect{|line| line.scan(/\[\w+\]/) if line.match(/Machine \[\w+\] \(ID \d+\) is in \[\w+\] state./)}.compact
+        stdout.split("\n").collect {|line| line.scan(/\[\w+\]/) if line.match(/Machine \[\w+\] \(ID \d+\) is in \[\w+\] state./)}.compact
       end
     end
 
@@ -66,17 +64,20 @@ module Dtm
       params[:type] ||= "Automated"
 
       self.method_missing(:add_job, params) do |stdout|
-        return self.job(stdout.slice(/\d+/)) if stdout.match(/Job Created Successfully with ID=\d+/)
-        raise
+        raise stdout unless stdout.match(/Job Created Successfully with ID=\d+/)
+
+        self.job(stdout.slice(/\d+/))
       end
     end
 
     #FIXME design choice, put stdout processing here or leave it to job?
     def schedule_job(params)
       self.method_missing(:schedule_job, params) do |stdout|
+        raise stdout if stdout.match(/^\[?ERROR/)
+
         stdout.split("\n").select {|line| line.match(/Schedule Created with Id \d+/)}
-                          .collect {|line| line.slice(/\d+/)}
-                          .collect {|schedule_id| self.schedule(schedule_id)}
+                          .map {|line| line.slice(/\d+/)}
+                          .map {|schedule_id| self.schedule(schedule_id)}
       end
     end
 

data/lib/dtm/task_desc.rb

@@ -0,0 +1,23 @@
+module Dtm
+  class ExecuteTaskDesc
+    class << self
+      def desc(params)
+        ExecuteTaskDesc.new(params).desc
+      end
+    end
+
+    def initialize(params)
+      params[:type] = "Execute"
+      params[:execution_phase] ||= "Regular"
+      params[:failure_action] ||= "FailAndStop"
+      #FIXME should we do this for user?
+      params[:command_line] = "\"#{params[:command_line]}\""
+
+      @params = params
+    end
+
+    def desc
+      @params
+    end
+  end
+end

data/lib/dtm/version.rb

@@ -1,3 +1,3 @@
 module Dtm
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/test_dtm.rb

@@ -1,5 +1,4 @@
-require 'simplecov'
-SimpleCov.start
+require 'test_helper'
 require 'test/unit'
 require 'dtm'
 

data/test/test_helper.rb

@@ -0,0 +1,2 @@
+require 'simplecov'
+SimpleCov.start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ruijia Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,8 +70,10 @@ files:
 - lib/dtm/dtm.rb
 - lib/dtm/job.rb
 - lib/dtm/schedule.rb
+- lib/dtm/task_desc.rb
 - lib/dtm/version.rb
 - test/test_dtm.rb
+- test/test_helper.rb
 homepage: https://github.com/rli9/dtm
 licenses:
 - MIT
@@ -99,3 +101,4 @@ summary: A ruby wrapper for Microsoft DTM (Driver Test Manager) console applicat
   wttcl.exe
 test_files:
 - test/test_dtm.rb
+- test/test_helper.rb