c42 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 250e5a6fa0e8c750309397b7e5607ae88ce62c62
-  data.tar.gz: 126adc8f06374759b4d7548d4ef1d9a4843bed30
+  metadata.gz: 4b04ad866235694be1aabb7ddbdc9fd299037a38
+  data.tar.gz: 30c56f675400d65067c5e810bc8a675074995b51
 SHA512:
-  metadata.gz: 58fbd2c5d64ded745587c7871eeb134597fccda2cffab1f8861f4c56988714eb8ad835583a1078a69e55dd691ee4b46d254222f93dd89771d9a9e061293b88bb
-  data.tar.gz: c62d8fcc8ecb1c6af4935306fec7e1317182ad440057b113aeaf6d5cf905946ce0ebf55a96e5d6fe8e1674d24cd21803c79c4484bdebb3648f776e4dcb90d839
+  metadata.gz: cc388d875f7c8da07f68c8860aa98dc0d304f150aae0cab8eecc6093a37a5261d6f14a4447ca337d6631d12435956c470d35b1147a5d40ad9540ee42f58759d9
+  data.tar.gz: 2c284b9f8b6af2e3dc03dc4f414e664691b8f67214d7e0b405748bcd0f10de449e5416271fc5810e98b0b6f3335221073fce55ce46852651a0d79d0c083964b7

data/bin/c42

@@ -3,4 +3,10 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)+"/../lib"))
 
 require "c42/runner"
-C42::Runner.run
+
+c42file = nil
+if ARGV.count > 1 && ARGV[0] == "--c42file"
+	ARGV.shift # into void
+	c42file = ARGV.shift
+end
+C42::Runner.run(c42file)

data/lib/c42/c42file.rb

@@ -2,6 +2,7 @@ require "thor"
 
 module C42
   class C42file < ::Thor
+    require "tempfile"
     include Thor::Actions
 
     no_commands {
@@ -33,23 +34,41 @@ module C42
 
     class << self
       @@pkg_name = nil
+      @@use_cwd = nil
+      @@file_pwd = %x{pwd}
+      @@stop_here = false
 
       alias_method :__original_desc, :desc
       def desc(name, *args)
         self.send(:__original_desc, *(["#{@@pkg_name}#{name}"] | (args || [])))
       end
 
+      def use_cwd(&block)
+        @@use_cwd = true
+        yield
+        @@use_cwd = nil
+      end
+
+
       def task(name, &block)
+        use_cwd = @@use_cwd
+        file_pwd = @@file_pwd
         self.instance_eval do
-          define_method :"#{@@pkg_name}#{name}", &block
+          define_method :"#{@@pkg_name}#{name}" do |*args|
+            old_cwd = Dir.pwd
+            Dir.chdir(file_pwd) unless use_cwd
+            yield *args
+            Dir.chdir(old_cwd) unless use_cwd
+          end
         end
       end
 
-      def shell_task(name, command, message = :system, recipient = Kernel)
+      def shell_task(name, command, options = {})
+        options = {message: :system, recipient: Kernel, use_cwd: false}.merge(options || {})
         task :"#{name}" do |*args|
           cmd = ([command] | (args || [])).flatten
-          (recipient).send(
-            message, 
+          (options[:recipient]).send(
+            options[:message], 
             *(
               command.is_a?(String) ? [cmd.join(" ")] : cmd
             )
@@ -64,6 +83,14 @@ module C42
           @@pkg_name = nil
         end
       end
+
+      def stop_here!
+        @@stop_here = true
+      end
+
+      def stopped_here?
+        @@stop_here
+      end
     end
   end
 end

data/lib/c42/runner.rb

@@ -6,20 +6,41 @@ module C42
   class Runner
     C42_HOME_FILE = File.expand_path("~/.c42/tasks.rb").freeze
 
-    def self.run
+    def self.run(c42file)
       c42s = []
-      Pathname.pwd.ascend do |path|
+      c42s << C42_HOME_FILE if File.exists?(C42_HOME_FILE)
+
+      if c42file.is_a?(String)
+        c42file = File.expand_path(c42file).freeze
+        if File.exists?(c42file)
+          c42s << c42file
+          fwd = Pathname.new(File.dirname(c42file))
+        else
+          raise "File not found: #{c42file}"
+        end
+      else
+        fwd = Pathname.pwd
+      end
+
+      fwd.ascend do |path|
+        c42s << Dir[Thor::Util.escape_globs(path)+"/tasks/*.c42.rb"].sort.reverse
         c42s << Dir[Thor::Util.escape_globs(path)+"/tasks.rb"]
-        c42s << Dir[Thor::Util.escape_globs(path)+"/tasks/.c42"]
       end
-      c42s << C42_HOME_FILE if File.exists?(C42_HOME_FILE)
       c42s.flatten!
+      c42s.uniq!
+      c42s.reverse!
 
       c42file = C42::C42file
-      c42s.reverse.each do |file|
+      c42s.each do |file|
         content = File.binread(file)
         c42file = Class.new(c42file)
+        c42file.class_eval(%{
+          class << self
+            @@file_pwd = "#{File.dirname(file)}"
+          end
+        });
         c42file.class_eval(content)
+        break if c42file.stopped_here?
       end
       c42file.start
     end

data/lib/c42/version.rb

@@ -1,3 +1,3 @@
 module C42 
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c42
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - commit42
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: C42 is an internal toolkit for chores based on Thor.