abid 0.2.8 → 0.3.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 423898158e4ca8b8c73ad5c4058c44e93943c096
-  data.tar.gz: bd9e7a3e20e83bf28cb94f783fef3ee9dbeb7cc7
+  metadata.gz: 84be77dd59b4a3d27716db8501118f9df14df077
+  data.tar.gz: 9cfae6fa33ba3b746eeb215592fe36c824eacaec
 SHA512:
-  metadata.gz: 62f05370ee659a08357f7a85c714f46bf61225022b46037772c4983534858107e02acf6031ddf12649b31a039dfe2b23c28c4149b5fd524512f7df8419f1ec54
-  data.tar.gz: 9c1592632ca93929f7a2118fec95872d73259bf0d947ee3e40efd7466012b1db14d2dfdae4eace47111cdef07773854a30b17a729bc0d615bf1c25dc3ce74fbe
+  metadata.gz: efc5b93b010454faa05029162fb5848ec60609a95283e1120e12699dea36d0ef6ec621784cfe25fc9ec7cbdd6b559f8eb070cbca396c05c38ba32c2f2d80e084
+  data.tar.gz: f89f4eacf5bb56985af9ca165a41235ccbe692f0c2415b8578ccec6380acbfa8523bf4fa4ea179c502ebe0a6522f687aa7c108662df77fca71b322fc3ea9630c

data/.gitignore

@@ -9,3 +9,7 @@
 /tmp/
 *.db
 /sample/out/
+
+/vendor/bundle
+.ruby-version
+.DS_Store

data/.yardopts

@@ -0,0 +1 @@
+-m markdown

data/abid.gemspec

@@ -4,29 +4,30 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'abid/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "abid"
+  spec.name          = 'abid'
   spec.version       = Abid::VERSION
-  spec.authors       = ["Hikaru Ojima"]
-  spec.email         = ["amijo4rihaku@gmail.com"]
+  spec.authors       = ['Hikaru Ojima']
+  spec.email         = ['amijo4rihaku@gmail.com']
 
-  spec.summary       = "Abid is a simple Workflow Engine based on Rake."
-  spec.description   = "Abid is a simple Workflow Engine based on Rake."
-  spec.homepage      = "https://github.com/ojima-h/abid"
-  spec.license       = "MIT"
+  spec.summary       = 'Abid is a simple Workflow Engine based on Rake.'
+  spec.description   = 'Abid is a simple Workflow Engine based on Rake.'
+  spec.homepage      = 'https://github.com/ojima-h/abid'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|sample)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'yard'
 
-  spec.add_dependency "rake", "~> 10.0"
-  spec.add_dependency "concurrent-ruby-ext"
-  spec.add_dependency "inifile"
-  spec.add_dependency "sequel"
-  spec.add_dependency "sqlite3"
-  spec.add_dependency "rbtree"
+  spec.add_dependency 'rake', '~> 10.0'
+  spec.add_dependency 'concurrent-ruby-ext'
+  spec.add_dependency 'inifile'
+  spec.add_dependency 'sequel'
+  spec.add_dependency 'sqlite3'
+  spec.add_dependency 'rbtree'
 end

data/lib/abid.rb

@@ -12,6 +12,8 @@ require 'rbtree'
 require 'sqlite3'
 require 'sequel'
 
+require 'abid/config'
+require 'abid/error'
 require 'abid/rake_extensions'
 require 'abid/version'
 require 'abid/abid_module'

data/lib/abid/abid_module.rb

@@ -11,5 +11,9 @@ module Abid
       @application = app
       Rake.application = app
     end
+
+    def config
+      @config ||= Config.new
+    end
   end
 end

data/lib/abid/application.rb

@@ -3,15 +3,13 @@ module Abid
     include Abid::TaskManager
 
     attr_reader :worker
-    attr_reader :config
 
     def initialize
       super
       @rakefiles = %w(abidfile Abidfile abidfile.rb Abidfile.rb) << abidfile
       @worker = Worker.new(self)
 
-      @config = IniFile.new(content: default_config)
-      @config.merge!(IniFile.load('config/abid.conf'))
+      Abid.config.load
     end
 
     def run
@@ -48,18 +46,6 @@ module Abid
       self[name].async_invoke(*args).wait!
     end
 
-    def default_config
-      {}
-    end
-
-    def default_database_config
-      {
-        adapter: 'sqlite',
-        database: File.join(Dir.pwd, 'abid.db'),
-        max_connections: 1
-      }
-    end
-
     def standard_rake_options
       super.each do |opt|
         case opt.first
@@ -78,10 +64,6 @@ module Abid
     def abid_options # :nodoc:
       sort_options(
         [
-          ['--retry-failed-job',
-           'Retry failed job.',
-           proc { options.retry_failed_job = true }
-          ],
           ['--repair',
            'Run the task in repair mode.',
            proc { options.repair = true }
@@ -132,12 +114,12 @@ module Abid
 
     def database
       return @database if @database
-      if config.sections.include?('abid database')
-        cfg = config['abid database'].map { |k, v| [k.to_sym, v] }.to_h
-      else
-        cfg = default_database_config
-      end
-      @database = Sequel.connect(**cfg)
+
+      # symbolize keys
+      params = {}
+      Abid.config.database.each { |k, v| params[k.to_sym] = v }
+
+      @database = Sequel.connect(**params)
     end
   end
 end

data/lib/abid/config.rb

@@ -0,0 +1,67 @@
+module Abid
+  class Config < Hash
+    DEFAULT_DATABASE_CONFIG = {
+      'adapter' => 'sqlite',
+      'database' => './abid.db',
+      'max_connections' => 1
+    }.freeze
+
+    # Config#load searches config file in `search_path` list.
+    #
+    # You can append an additinal config file path:
+    #
+    #     Config.search_path.unshift('your_config_file')
+    #
+    # @return [Array<String>] search path
+    def self.search_path
+      @search_path ||= [
+        './config/abid.yml'
+      ]
+    end
+
+    # @return [Hash] database configuration
+    attr_reader :database
+
+    def initialize
+      super
+      @database = {}
+    end
+
+    # Load config file.
+    #
+    # If `config_file` is specified and does not exist, it raises an error.
+    #
+    # If `config_file` is not specified, it searches config file in
+    # Config.earch_path.
+    #
+    # When #load is called again, original cofnigurations is cleared.
+    #
+    # @param config_file [String] config file
+    # @return [Config] self
+    def load(config_file = nil)
+      replace(load_config_file(config_file))
+      @database = load_database_config
+      self
+    end
+
+    private
+
+    def load_config_file(file_path)
+      return YAML.load_file(file_path) if file_path
+
+      load_default_config_file
+    rescue => e
+      raise Error, 'failed to load config file: ' + e.message
+    end
+
+    def load_default_config_file
+      file_path = self.class.search_path.find { |path| File.exist?(path) }
+      return {} unless file_path
+      YAML.load_file(file_path)
+    end
+
+    def load_database_config
+      fetch('database') { DEFAULT_DATABASE_CONFIG.dup }
+    end
+  end
+end

data/lib/abid/error.rb

@@ -0,0 +1,3 @@
+module Abid
+  class Error < StandardError; end
+end

data/lib/abid/task.rb

@@ -107,7 +107,7 @@ module Abid
     def concerned?
       state.reload
 
-      if !application.options.retry_failed_job && !application.options.repair && state.failed? && !top_level?
+      if !application.options.repair && state.failed? && !top_level?
         fail "#{name} -- task has been failed"
       end
 

data/lib/abid/version.rb

@@ -1,3 +1,3 @@
 module Abid
-  VERSION = "0.2.8"
+  VERSION = '0.3.0-alpha.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abid
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0.pre.alpha.1
 platform: ruby
 authors:
 - Hikaru Ojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +160,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- ".yardopts"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -159,7 +174,9 @@ files:
 - lib/abid.rb
 - lib/abid/abid_module.rb
 - lib/abid/application.rb
+- lib/abid/config.rb
 - lib/abid/dsl_definition.rb
+- lib/abid/error.rb
 - lib/abid/mixin_task.rb
 - lib/abid/params_parser.rb
 - lib/abid/play.rb
@@ -190,9 +207,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1