dake 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 480b83fa04055fcf5d393da94b870bafdb901c5a39788d52dbee7d89244f5f1f
-  data.tar.gz: a10e599b85562d3302997cd2500117357fbbacd2bae85cf7232452246afe5613
+  metadata.gz: 6015ab5226665506052c97193879c5747c726924fe1a0706ed68d26e6616e067
+  data.tar.gz: 9566fa629a716eede2f11277c7cdc40c009377e33ae84c05261ec28c433821e3
 SHA512:
-  metadata.gz: 6c849058294a6c5daf084d19ba34d6cbecc53736863958cd064f1ab5f2f5d1cbe1a83c903fc137622ce02d2fa6547285a07882643b84d01c42b6a35b809bacb4
-  data.tar.gz: c665db3ce2bafab077723497299735e5c9d455654385b8c1845e944454ec0140c5410bbf5b4b67410224eb27b39ac97d7798a284b47c9d3e6d77ff2ce4394cd4
+  metadata.gz: 3f53b15a4c8edf2f1559f1c45f573762393652f2fd924c61c834d76a092acb37dce1b22efef07f58b34eeb7f8e272d14a40997bd7b7b44b0e62a7cc7129bb1ef
+  data.tar.gz: d2516d0cf223c38b599ca96beb37fc3f4d87e68dd04772313255d669eb3ccfe6f3f97740a6910e1268259a6f3db1a73875998082bbdc5bdbb164b52e86e42c73

data/dake.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/minor6th/dake"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = '>= 2.4.0'
+
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   # if spec.respond_to?(:metadata)
@@ -43,10 +45,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "awesome_print"
 
   spec.add_runtime_dependency "gli"
-  spec.add_runtime_dependency "git"
+  #spec.add_runtime_dependency "git"
   #spec.add_runtime_dependency "sqlite3"
   spec.add_runtime_dependency "colorize"
-  spec.add_runtime_dependency "sinatra"
+  #spec.add_runtime_dependency "sinatra"
   spec.add_runtime_dependency "parslet"
   spec.add_runtime_dependency "concurrent-ruby"
 end

data/lib/dake/database.rb

@@ -1,4 +1,4 @@
-require 'git'
+# require 'git'
 # require "sqlite3"
 
 class DakeDB

data/lib/dake/executor.rb

@@ -47,50 +47,52 @@ class DakeExecutor
 
       while next_step = queue.deq
         @pool.post(next_step) do |step|
-          lock.acquire_read_lock
-          error_step = error_steps.include? step
-          lock.release_read_lock
-          if error_step
-            line, column = @analyzer.step_line_and_column step
-            msg = "Step(#{step.object_id}) defined in #{step.src_file} at #{line}:#{column} " +
-                  "skipped due to prerequisite step(s) error."
-            error_queue << Exception.new(msg)
-          else
-            execute_step(step, dry_run, log)
-          end
-          lock.acquire_write_lock
-          dep_map.delete step
-          if dep_map.empty?
-            queue.close
-          else
-            @dep_graph.succ_step[step].each do |succ|
-              next unless dep_map[succ]
-              dep_map[succ].delete step
-              if dep_map[succ].empty?
-                queue << succ
-              elsif dep_map[succ].all? { |dep_step| error_steps.include? dep_step }
-                error_steps << succ
-                queue << succ
+          begin
+            lock.acquire_read_lock
+            error_step = error_steps.include? step
+            lock.release_read_lock
+            if error_step
+              line, column = @analyzer.step_line_and_column step
+              msg = "Step(#{step.object_id}) defined in #{step.src_file} at #{line}:#{column} " +
+                    "skipped due to prerequisite step(s) error."
+              error_queue << Exception.new(msg)
+            else
+              execute_step(step, dry_run, log)
+            end
+            lock.acquire_write_lock
+            dep_map.delete step
+            if dep_map.empty?
+              queue.close
+            else
+              @dep_graph.succ_step[step].each do |succ|
+                next unless dep_map[succ]
+                dep_map[succ].delete step
+                if dep_map[succ].empty?
+                  queue << succ
+                elsif dep_map[succ].all? { |dep_step| error_steps.include? dep_step }
+                  error_steps << succ
+                  queue << succ
+                end
               end
             end
-          end
-          lock.release_write_lock
-        rescue Exception => e
-          error_queue << e
-          lock.acquire_write_lock
-          error_steps << step
-          dep_map.delete step
-          if dep_map.empty?
-            queue.close
-          else
-            @dep_graph.succ_step[step].each do |succ|
-              if dep_map[succ].all? { |dep_step| error_steps.include? dep_step }
-                error_steps << succ
-                queue << succ
+            lock.release_write_lock
+          rescue Exception => e
+            error_queue << e
+            lock.acquire_write_lock
+            error_steps << step
+            dep_map.delete step
+            if dep_map.empty?
+              queue.close
+            else
+              @dep_graph.succ_step[step].each do |succ|
+                if dep_map[succ].all? { |dep_step| error_steps.include? dep_step }
+                  error_steps << succ
+                  queue << succ
+                end
               end
             end
+            lock.release_write_lock
           end
-          lock.release_write_lock
         end
       end
       @pool.shutdown

data/lib/dake/scheme.rb

@@ -36,7 +36,7 @@ module DakeScheme
     def initialize(scheme_part, path_part, step)
       if path_part.start_with? '/'
        @path = path_part
-       @src = Pathname.new(path_part).relative_path_from(step.context['BASE'])
+       @src = Pathname.new(path_part).relative_path_from(Pathname.new(step.context['BASE']))
       else
         @path = File.expand_path(path_part, step.context['BASE'])
         @src = path_part

data/lib/dake/version.rb

@@ -1,3 +1,3 @@
 module Dake
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dake
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - minor6th
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-07 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: git
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="