c42 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebf0e158565afb26399972d6eeffc1f5d5704161
-  data.tar.gz: d4a9ef455432f84deb01cca6fa8d03b20aef6566
+  metadata.gz: 250e5a6fa0e8c750309397b7e5607ae88ce62c62
+  data.tar.gz: 126adc8f06374759b4d7548d4ef1d9a4843bed30
 SHA512:
-  metadata.gz: 924cb6e1d3c08d45436defd9c7ac00e433b9d2cb6931bcb71ee653719d48d15768ff1591c276d7b51b4b1cd5caad14fcf3acc9edaace359046fe39b8effc9c9b
-  data.tar.gz: 383a814a60b9cb0ffb155ea139b838c576ffd930b0a59eebc7efeca8b41d354d655add2a8979d21043b8b194087b0b6a1bc33378b79d4ad465ec97e153dcc07a
+  metadata.gz: 58fbd2c5d64ded745587c7871eeb134597fccda2cffab1f8861f4c56988714eb8ad835583a1078a69e55dd691ee4b46d254222f93dd89771d9a9e061293b88bb
+  data.tar.gz: c62d8fcc8ecb1c6af4935306fec7e1317182ad440057b113aeaf6d5cf905946ce0ebf55a96e5d6fe8e1674d24cd21803c79c4484bdebb3648f776e4dcb90d839

data/lib/c42/c42file.rb

@@ -4,44 +4,52 @@ module C42
   class C42file < ::Thor
     include Thor::Actions
 
-protected
-    def shell
-      @shell ||= Thor::Base.shell.new
-    end
+    no_commands {
+      def shell
+        @shell ||= Thor::Base.shell.new
+      end
 
-    def error(msg)
-      shell.say_status("ERROR", msg, :red)
-    end
+      def error(msg)
+        shell.say_status("ERROR", msg, :red)
+      end
 
-    def warn(msg)
-      shell.say_status("WARN", msg, :yellow)
-    end
+      def warn(msg)
+        shell.say_status("WARN", msg, :yellow)
+      end
 
-    def info(msg)
-      shell.say_status("INFO", msg, :on_black)
-    end
+      def info(msg)
+        shell.say_status("INFO", msg, :on_black)
+      end
 
-    def debug(msg)
-      shell.say_status("DEBUG", msg, :green)
-    end
+      def debug(msg)
+        shell.say_status("DEBUG", msg, :green)
+      end
 
-    def fatal(msg)
-      shell.say_status("FATAL", msg, :on_red)
-      exit
-    end
+      def fatal(msg)
+        shell.say_status("FATAL", msg, :on_red)
+        exit
+      end
+    }
 
     class << self
+      @@pkg_name = nil
+
+      alias_method :__original_desc, :desc
+      def desc(name, *args)
+        self.send(:__original_desc, *(["#{@@pkg_name}#{name}"] | (args || [])))
+      end
+
       def task(name, &block)
         self.instance_eval do
-          define_method :"#{name}", &block
+          define_method :"#{@@pkg_name}#{name}", &block
         end
       end
 
-      def shell_task(name, command)
+      def shell_task(name, command, message = :system, recipient = Kernel)
         task :"#{name}" do |*args|
           cmd = ([command] | (args || [])).flatten
-          Kernel.send(
-            :exec, 
+          (recipient).send(
+            message, 
             *(
               command.is_a?(String) ? [cmd.join(" ")] : cmd
             )
@@ -50,35 +58,11 @@ protected
       end
 
       def package(pkg_name, &block)
-        self.instance_eval %{
-            class << self
-              alias_method :__original_desc, :desc
-              alias_method :__original_task, :task
-
-              def desc(name, *args, &block)
-                self.send(:__original_desc, *(["#{pkg_name}:\#{name}"] | (args || [])))
-              end
-
-              def task(name, *args, &block)
-                self.instance_eval do
-                  define_method :"#{pkg_name}:\#{name}", &block
-                end
-              end
-            end
-        }
-
-        self.instance_eval &block
-
-        self.instance_eval %{
-            class << self
-              remove_method :desc
-              remove_method :task
-              alias_method :desc, :__original_desc
-              alias_method :task, :__original_task
-              remove_method :__original_desc
-              remove_method :__original_task
-            end
-        }
+        self.instance_eval do
+          @@pkg_name = "#{pkg_name}:"
+          yield  
+          @@pkg_name = nil
+        end
       end
     end
   end

data/lib/c42/version.rb

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

data/lib/c42.rb

@@ -2,6 +2,5 @@ require "bundler/version"
 
 module C42
  class << self
-
  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: c42
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - commit42