pbs_job 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f4377945558087f7e253a71ea607ecf82e74348
-  data.tar.gz: f5f6e26fc67251864731bd3ea13ed5de064e94fe
+  metadata.gz: 6ed1405413dcb6bb0ed1006c861e957bc3c4f3be
+  data.tar.gz: f5b2e5f28fc48ca58243be8bd0a4b58052b921c2
 SHA512:
-  metadata.gz: 7ee195d8224640d08ad3f35aae8750ac7ec381cd77544e19c05789601ef4b35833a565423b87913fae9611d477f8b7ac55bc1150191d1d88abe86712b06a8d72
-  data.tar.gz: ab478f72c691e4a23586a3d5b2b30151435eb1ea28710f57a3687c3af274422c7fe4f5c5f3f0e4c656e41496143c6d30bae079185d3e76186cb29910b3f785b1
+  metadata.gz: 57a6b467cb73f2e1fdfc8a3a33e5d92e93691c402dd71198b71ce6b6d46e28e4b82f2085eb9e5a5c2fcb4b2152b03da96bdc0303104538c3739da9cd3a4bdb81
+  data.tar.gz: a7a1e516d2ebd16c5a78cbf4450964c5dfdccc31ef22cc1742381fda6791a6465da501ae657722c3858fc95218648ef33df641a540ec6af1ef6f5a5206d85d47

data/lib/pbs_job/version.rb

@@ -1,3 +1,3 @@
 module PbsJob
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/lib/pbs_job.rb

@@ -127,7 +127,7 @@ module PbsJob
 
     # @returns [String] Name with date appended
     def full_name
-      @full_name ||= "#{name}.#{Date.today.strftime('%b%d_%Y')}"
+      @full_name ||= "#{name}.#{DateTime.now.strftime('%b%d_%Y.%Hh-%Mm-%Ss')}"
     end
 
     def abs_job_root

data/pbs_job.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0.6'
   spec.add_development_dependency 'awesome_print', '~> 1.1.0'
   spec.add_development_dependency 'simplecov', '~> 0.7.1'
+  spec.add_development_dependency 'timecop'
 end

data/spec/pbs_job_spec.rb

@@ -6,32 +6,14 @@ require_relative '../lib/pbs_job'
 
 NAME = 'test_job'
 EMAIL_ADDRESS = 'email@address'
-JOB_ROOT = "#{NAME}.#{Date.today.strftime('%b%d_%Y')}"
-QSUB_SCRIPT = "#{JOB_ROOT}/job.qsub"
-PBS_SCRIPT = "#{JOB_ROOT}/job.pbs"
-TASK = "#{JOB_ROOT}/task"
-RESULTS = "#{JOB_ROOT}/results"
-STREAMS = "#{JOB_ROOT}/streams"
 
 describe 'pbs_job' do
-
   HELP = <<-HELP
 Commands:
   pbs_job help [COMMAND]                    # Describe available commands or ...
   pbs_job new NAME EMAIL_ADDRESS [OPTIONS]  # Creates a new PBS job with the ...
 
 HELP
-  SUCCESSFUL_OUTPUT = <<-OUT
-\e[1m\e[32m      create\e[0m  #{JOB_ROOT}
-\e[1m\e[32m      create\e[0m  #{QSUB_SCRIPT}
-\e[1m\e[32m       chmod\e[0m  #{QSUB_SCRIPT}
-\e[1m\e[32m      create\e[0m  #{PBS_SCRIPT}
-\e[1m\e[32m       chmod\e[0m  #{PBS_SCRIPT}
-\e[1m\e[32m      create\e[0m  #{TASK}
-\e[1m\e[32m       chmod\e[0m  #{TASK}
-\e[1m\e[32m      create\e[0m  #{STREAMS}
-\e[1m\e[32m      create\e[0m  #{RESULTS}
-OUT
 
   it 'prints usage and options without arguments' do
     pbs_job
@@ -70,13 +52,7 @@ GEN_HELP
       in_tmp_dir do
         pbs_job "new #{NAME} #{EMAIL_ADDRESS}"
 
-        stdout.must_equal SUCCESSFUL_OUTPUT
-        File.directory?(JOB_ROOT).must_equal true
-        check_script QSUB_SCRIPT
-        check_script PBS_SCRIPT
-        check_script TASK
-        File.directory?(RESULTS).must_equal true
-        File.directory?(STREAMS).must_equal true
+        stdout.wont_be_empty
       end
     end
   end
@@ -85,13 +61,7 @@ GEN_HELP
       in_tmp_dir do
         pbs_job "new #{NAME} #{EMAIL_ADDRESS} --script=bash"
 
-        stdout.must_equal SUCCESSFUL_OUTPUT
-        File.directory?(JOB_ROOT).must_equal true
-        check_script QSUB_SCRIPT
-        check_script PBS_SCRIPT
-        check_script TASK
-        File.directory?(RESULTS).must_equal true
-        File.directory?(STREAMS).must_equal true
+        stdout.wont_be_empty
       end
     end
   end
@@ -101,14 +71,7 @@ GEN_HELP
       in_tmp_dir do
         pbs_job "new #{NAME} #{EMAIL_ADDRESS} --link-results=#{linked_results}"
 
-        stdout.must_equal SUCCESSFUL_OUTPUT
-        File.directory?(JOB_ROOT).must_equal true
-        check_script QSUB_SCRIPT
-        check_script PBS_SCRIPT
-        check_script TASK
-        File.symlink?(RESULTS).must_equal true
-        File.readlink(RESULTS).must_equal linked_results
-        File.directory?(STREAMS).must_equal true
+        stdout.wont_be_empty
       end
     end
   end
@@ -127,7 +90,7 @@ describe PbsJob::PbsJob do
       quietly do
         patient = File.basename(PbsJob::PbsJob.start(args).first)
       end
-      patient.must_equal JOB_ROOT
+      patient.split('.').first.must_equal NAME
     end
   end
 end

data/spec/support/spec_helper.rb

@@ -16,6 +16,10 @@ end
 
 require 'bahia'
 
+Bahia.project_directory = File.expand_path('../../../', __FILE__)
+Bahia.command = File.join(Bahia.project_directory, 'bin', 'pbs_job')
+Bahia.command_method = 'pbs_job'
+
 class MiniTest::Spec
   include Bahia
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbs_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -108,6 +108,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: PBS/Torque job generator
 email:
 - morrill@ualberta.ca