abid 0.3.0.pre.alpha.4 → 0.3.0.pre.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1596801ffb3b1eb65f3afcabef8320657e25b53a
-  data.tar.gz: d1eca9882b7e33183b8c7fe1664249e10e7823f6
+  metadata.gz: aa7a38773bdfcb607b2640de85df8f0c3039ee2b
+  data.tar.gz: 876354c5246cbf418d99fc88d9a32d7ab2b628d3
 SHA512:
-  metadata.gz: 08fd18e4a5280106ee3e23a2e422692428b211f3f35de959512f9bf1a4cde6b75408dbfdbd7ba32d37db6c56177a891bd105fbf25ff05a76865a8975fecef5ad
-  data.tar.gz: 0df0a4df266bf2e69f755a1aff2458b2bbbb7d94f3fffc106ae476c2bff241e1f86d336158cb03de19ed0698700f5f43e7b1ca8e4272b945a630ced6cfc30ae2
+  metadata.gz: c03979c2d34b3f12819d47a8f7f28fce29fae3b56f03ede95f203a30ead441abb9e6a78f7cc1fdfc6a249c4d5dff29ae2a2c438c6d110dd373b31a8246838f47
+  data.tar.gz: 9b530b8336df34055d30ec0b83bff880db5c8573f6c36d5a92fc6f05a4586262b652cf41aaf13bca31eb814b1569592bcb7c7c084f9dc9de97be436ba4909dc2

data/.travis.yml

@@ -2,4 +2,4 @@ language: ruby
 rvm:
   - 2.1.0
 before_install: gem install bundler -v 1.10.6
-before_script: bundle exec abidsc migrate -C test/abid.yml
+before_script: bundle exec abidsc upgrade -C test/abid.yml

data/README.md

@@ -26,7 +26,7 @@ Abid is a simple Workflow Engine based on Rake.
 
 2. Setup a database.
 
-        $ bundle exec abidsc migrate
+        $ bundle exec abidsc init
 
 ## Usage
 
@@ -352,7 +352,8 @@ $ abidsc list --after='2000-01-01 00:00:00" --before="2000=01-02 00:00:00"  # Di
 $ abidsc revoke STATE_ID # remove the job history  # Remove the play recored from DB.
 $ abidsc assume TASK_NAME date=2000-01-01  # Insert a record that the play successed into DB.
 
-$ abidsc migrate  # Initialize or upgrade DB schema.
+$ abidsc init  # Initialize DB schema.
+$ abidsc upgrade  # Upgrade DB schema.
 ```
 
 ## Development

data/bin/setup

@@ -7,4 +7,4 @@ bundle install
 # Do any other automated setup that you need to do here
 
 # Initialize database
-bundle exec abidsc migrate -C test/abid.yml
+bundle exec abidsc init -C test/abid.yml

data/lib/abid/application.rb

@@ -15,6 +15,7 @@ module Abid
   class Application < Rake::Application
     def initialize(env)
       super()
+      @name = 'abid'
       @rakefiles = %w(abidfile Abidfile abidfile.rb Abidfile.rb)
       @env = env
       @global_params = {}
@@ -24,7 +25,7 @@ module Abid
     end
     attr_reader :global_params, :global_mixin, :job_manager, :after_all_actions
 
-    def init
+    def init(app_name = 'abid')
       super
       @env.config.load(options.config_file)
     end
@@ -32,6 +33,8 @@ module Abid
     def top_level
       if options.show_tasks || options.show_prereqs
         super
+      elsif options.show_job_preqs
+        display_job_prerequisites
       else
         run_with_engine { invoke_top_level_tasks }
       end
@@ -57,6 +60,24 @@ module Abid
       call_after_all_actions
     end
 
+    # Display the job prerequisites
+    def display_job_prerequisites
+      from = parse_job_string(options.show_job_preqs)
+      to = parse_job_string(options.show_job_preqs_to) \
+        if options.show_job_preqs_to
+      @job_manager.collect_prerequisites(from, to).each do |job|
+        puts "#{name} #{job}"
+      end
+    end
+
+    def parse_job_string(job_string)
+      require 'shellwords'
+      args = Shellwords.split(job_string)
+      params, tasks = ParamsFormat.collect_params(args)
+      name, = parse_task_string(tasks.first)
+      @job_manager[name, params]
+    end
+
     def standard_rake_options
       super.each do |opt|
         case opt.first
@@ -95,7 +116,17 @@ module Abid
            end],
           ['--[no-]logging',
            'Enable logging. (default: on)',
-           proc { |v| options.logging = v }]
+           proc { |v| options.logging = v }],
+          ['--force',
+           'Force execute the task without regard to dependencies and the' \
+           ' task state.',
+           proc { options.force = true }],
+          ['--job-prereqs JOB', '-J',
+           'Display the job dependencies, then exit',
+           proc { |v| options.show_job_preqs = v }],
+          ['--to JOB',
+           'Show only the job dependencies which depends on this job',
+           proc { |v| options.show_job_preqs_to = v }]
         ]
       )
     end

data/lib/abid/cli.rb

@@ -15,10 +15,14 @@ module Abid
       puts @env.config.to_yaml
     end
 
-    desc 'migrate', 'Run database migration'
-    def migrate
-      require 'abid/cli/migrate'
-      Migrate.new(@env, options).run
+    desc 'init', 'Create new abid project'
+    def init
+      migrate
+    end
+
+    desc 'upgrade', 'Upgrade current abid project'
+    def upgrade
+      migrate
     end
 
     desc 'assume TASK [TASKS..] [PARAMS]', 'Assume the job to be SUCCESSED'
@@ -50,5 +54,12 @@ module Abid
       Revoke.new(@env, options, [job_id, *rest_args]).run
     end
     map rm: :revoke
+
+    private
+
+    def migrate
+      require 'abid/cli/migrate'
+      Migrate.new(@env, options).run
+    end
   end
 end

data/lib/abid/dsl/job_manager.rb

@@ -48,6 +48,29 @@ module Abid
         raise "#{task.name}: param #{key} is not specified"
       end
       private :fetch_param
+
+      # @param job [Job] collect prerequisites of the job.
+      # @param target_job [Job] collect only prerequisites depending on
+      #   `target_job` if specified.
+      # @return [Array<Job>]
+      def collect_prerequisites(job, target_job = nil)
+        collect_prerequisites_iter(job, {}, target_job).keys
+      end
+
+      def collect_prerequisites_iter(job, checked, target_job = nil)
+        return {} if checked.include?(job)
+        checked[job] = nil
+
+        return { job => nil } if target_job == job
+
+        found = {}
+        job.prerequisites.each do |preq|
+          found.update(collect_prerequisites_iter(preq, checked, target_job))
+        end
+        found[job] = nil if target_job.nil? || !found.empty?
+        found
+      end
+      private :collect_prerequisites_iter
     end
   end
 end

data/lib/abid/engine/executor.rb

@@ -54,6 +54,7 @@ module Abid
       # Skip the job if it should be.
       # @return [Boolean] true if skipped
       def precheck_to_skip
+        return false if @job.options.force
         return @process.skip unless @job.concerned?
 
         return false if @job.repair? && !@prerequisites.empty?

data/lib/abid/engine/process.rb

@@ -74,6 +74,7 @@ module Abid
       attr_reader :state_service
 
       def prerequisites
+        return [] if @job.options.force
         @job.prerequisites.map { |preq| @engine.process_manager[preq] }
       end
 

data/lib/abid/version.rb

@@ -1,3 +1,3 @@
 module Abid
-  VERSION = '0.3.0-alpha.4'
+  VERSION = '0.3.0-alpha.5'
 end

data/migrations/02_create_state_table_index.rb

@@ -0,0 +1,9 @@
+Sequel.migration do
+  change do
+    alter_table(:states) do
+      add_index :name
+      add_index :state
+      add_index :start_time
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abid
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.alpha.4
+  version: 0.3.0.pre.alpha.5
 platform: ruby
 authors:
 - Hikaru Ojima
@@ -195,6 +195,7 @@ files:
 - lib/abid/status.rb
 - lib/abid/version.rb
 - migrations/01_create_state_table.rb
+- migrations/02_create_state_table_index.rb
 homepage: https://github.com/ojima-h/abid
 licenses:
 - MIT