theme-juice 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 885cc7b8cbb4e35b9a8c1c97fbcb0031131e1ba5
-  data.tar.gz: ec17f04a2d409d259373be6d961667d5100e2645
+  metadata.gz: 5d78a7169a4c3799728ba0d7fbe5d3553a3e6f59
+  data.tar.gz: eab7e61c4dfd6b4450f0887db9424f6bfb8ba721
 SHA512:
-  metadata.gz: cc3a762ee08780da5ce286d30a7ac358d2fdd6cf695805b65fe749f814475948ec984970b9b0e5a081fea1cbf8a061a573f12f5827ca459023cd6430d06e59b9
-  data.tar.gz: 91cab191d53c060db510a5437d4ea07a9e8dd8aa341d2122d58f9d3880a3cea5a23cf23c8b784ba3c8e9f80160f7423dd9214c76eaf24013207cfdd9ca54ce44
+  metadata.gz: c84429630cd653c15ba70e8560d3a28b21364f9163088f734f4dc01e1907d589b66666eeffa14d865c5ce1c2eddcaf1845b1d94eed8a1953ab712f3d44ac2548
+  data.tar.gz: 5093ba361d92597e68e67bd66d81b7223f3f6e7ed69d2b81d8918f66c09592b46497c7b7cab3279fe2d8cfe33c9784c01cba2217518b0da2b839388996dc366b

data/lib/theme-juice/config.rb

@@ -24,13 +24,12 @@ module ThemeJuice
     end
 
     def format_command(cmd, args = [])
-      return cmd if args.empty?
 
-      if %r{(%args%)|(%arguments%)} =~ cmd
-        cmd.gsub! %r{(%args%)|(%arguments%)}, args.join(" ")
+      if multi_arg_regex =~ cmd
+        cmd.gsub! multi_arg_regex, args.join(" ")
       else
         args.to_enum.with_index(1).each do |arg, i|
-          cmd.gsub! %r{(%arg#{i}%)|(%argument#{i}%)}, arg
+          cmd.gsub! single_arg_regex, arg
         end
       end
 
@@ -39,7 +38,7 @@ module ThemeJuice
 
     def config
       begin
-        YAML.load_file Dir["#{@project.location}/*"].select { |f| regex =~ File.basename(f) }.last ||
+        YAML.load_file Dir["#{@project.location}/*"].select { |f| config_regex =~ File.basename(f) }.last ||
           @io.error("Config file not found in '#{@project.location}'")
       rescue ::Psych::SyntaxError => err
         @io.error "Config file is invalid" do
@@ -48,10 +47,18 @@ module ThemeJuice
       end
     end
 
-    def regex
+    def config_regex
       %r{^(((\.)?(tj)|((J|j)uicefile))(.y(a)?ml)?$)}
     end
 
+    def multi_arg_regex
+      %r{(%args%)|(%arguments%)}
+    end
+
+    def single_arg_regex
+      %r{(%arg#{i}%)|(%argument#{i}%)}
+    end
+
     extend self
   end
 end

data/lib/theme-juice/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Ezekiel Gabrielse