theme-juice 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6509e418159bf7e3d436c6b5be1368223c3901a8
-  data.tar.gz: 1daf41ef193c92564795ac6c724ff07d1d77aad9
+  metadata.gz: 991650b2f8489bbf3583aec1b8fad17215c6e708
+  data.tar.gz: dfd1e0ec39d06a3fc7690bc16dd4894980e34391
 SHA512:
-  metadata.gz: f51682465a715e92554a08b1073e4fadc65c4bad6e2f81370e2d494dd6cc2a7ec8eb5ed7d964387e7b5d4a9023aef12aaf199a845d0e2459b429c986a05913ae
-  data.tar.gz: 1974e585d8ecc3adab7fa5eb4e0075a95d35cb6144599a388edc3fe5f22bad588e0e6250c0908321a4907de08912b56ca553aa309ba75071a9098143387620ad
+  metadata.gz: 31e023c021d1620d886269e87f13a8e1f309c964a92f80846b761bc1a4697e02427064c1c5d257643ca6355637fcfaf531f62af1a0be33639e2f3eac44dfb77f
+  data.tar.gz: 0f19081e3fcbea70c81d8f14091721b7966cf57a99f1b4e032f8bdfffea8991b7a865c1295a1d0d31cb9cde4c5aa6d25f28e5c7a659003d2944c9061c8b8a76c

data/lib/theme-juice/cli.rb

@@ -171,20 +171,20 @@ module ThemeJuice
       @list.new(options).list :projects
     end
 
-    desc "install", "Run installation for project"
+    desc "update", "Update tj and its dependencies"
     #
     # @return {Void}
     #
-    def install
-      @config.install
+    def update(*commands)
+      @io.error "Not implemented"
     end
 
-    desc "update", "Update tj and its dependencies"
+    desc "install", "Run installation for project"
     #
     # @return {Void}
     #
-    def update
-      @io.error "Not implemented"
+    def install(*commands)
+      @config.install commands
     end
 
     desc "watch [COMMANDS]", "Watch and compile assets"
@@ -192,7 +192,7 @@ module ThemeJuice
     # @return {Void}
     #
     def watch(*commands)
-      @config.watch *commands
+      @config.watch commands
     end
 
     desc "vendor [COMMANDS]", "Manage vendor dependencies"
@@ -200,7 +200,7 @@ module ThemeJuice
     # @return {Void}
     #
     def vendor(*commands)
-      @config.vendor *commands
+      @config.vendor commands
     end
 
     desc "dist [COMMANDS]", "Package project for distribution"
@@ -208,7 +208,7 @@ module ThemeJuice
     # @return {Void}
     #
     def dist(*commands)
-      @config.dist *commands
+      @config.dist commands
     end
 
     desc "wp [COMMANDS]", "Manage WordPress installation"
@@ -216,7 +216,7 @@ module ThemeJuice
     # @return {Void}
     #
     def wp(*commands)
-      @config.wp *commands
+      @config.wp commands
     end
 
     desc "backup [COMMANDS]", "Backup project"
@@ -224,7 +224,7 @@ module ThemeJuice
     # @return {Void}
     #
     def backup(*commands)
-      @config.backup *commands
+      @config.backup commands
     end
 
     desc "test [COMMANDS]", "Manage and run project tests"
@@ -232,7 +232,7 @@ module ThemeJuice
     # @return {Void}
     #
     def test(*commands)
-      @config.test *commands
+      @config.test commands
     end
 
     desc "vm [COMMANDS]", "Manage development environment"

data/lib/theme-juice/config.rb

@@ -12,7 +12,7 @@ module ThemeJuice
 
       config.fetch("commands", {})
         .fetch(method.to_s) { @io.error("Command '#{method}' not found in config") }
-        .each { |cmd| run "#{cmd} #{args.join(" ") unless args.empty?}" }
+        .each { |cmd| run format_command(cmd, *args) }
     end
 
     private
@@ -23,6 +23,19 @@ module ThemeJuice
       end
     end
 
+    def format_command(cmd, args)
+
+      if %r{(%args%)|(%arguments%)} =~ cmd
+        cmd.gsub! %r{(%args%)|(%arguments%)}, args.join(" ")
+      else
+        args.to_enum.with_index(1).each do |arg, i|
+          cmd.gsub! %r{(%arg#{i}%)|(%argument#{i}%)}, arg
+        end
+      end
+
+      cmd
+    end
+
     def config
       begin
         YAML.load_file Dir["#{@project.location}/*"].select { |f| regex =~ File.basename(f) }.last ||
@@ -35,7 +48,7 @@ module ThemeJuice
     end
 
     def regex
-      %r{^((\.)?(tj.y(a)?ml)|((J|j)uicefile(.y(a)?ml)?))}
+      %r{^(((\.)?(tj)|((J|j)uicefile))(.y(a)?ml)?$)}
     end
 
     extend self

data/lib/theme-juice/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module ThemeJuice
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor