theme-juice 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d852238a2f118a976b83215d898bcbfd8f9441a
-  data.tar.gz: 1ed2f637f2203880711385de5cc6e1280a9b04ae
+  metadata.gz: 11b5017a31a2b2fe8a83b3747a0a330ba18c60e6
+  data.tar.gz: c015555bd46bf4fcb0613f4cb63fa11ab120ef5a
 SHA512:
-  metadata.gz: d20a11190ed54f8d814071a33825c2dc01672052082756669c3bcc5e17cb14c630c6ffabccfe4a5e71cb985dc4c6320d051aa4e542caa57ce2a5ba98e5b9fdc2
-  data.tar.gz: 00151b454e3eefef988b32a7956b4764ed88c777940ae567c1e7f8f836ab9e9ecf220eae8f15ffc795a83a68a8d2e41e7851bd1d0521d1a8786c285a2133a499
+  metadata.gz: 9e1e0f73cee850964784f776ecd91482355f10ab88b96077de5cccf82392e3886d98e0b0cec174bbecca4f98ef29b629b4e4e428fcf085a07c361d2453ddd75f
+  data.tar.gz: 845d8e331e723885e716afe67ce724dd6b69db119f795f95157efcfe132f1a48e56adab4691a50d108561518d493f6f1dac4cc9f4a60591b9ce62da14216e0fe

data/README.md

@@ -3,7 +3,7 @@
 [![Travis](https://img.shields.io/travis/ezekg/theme-juice-cli.svg?style=flat-square)](https://travis-ci.org/ezekg/theme-juice-cli)
 [![Code Climate](https://img.shields.io/codeclimate/github/ezekg/theme-juice-cli.svg?style=flat-square)](https://codeclimate.com/github/ezekg/theme-juice-cli)
 [![Code Climate](https://img.shields.io/codeclimate/coverage/github/ezekg/theme-juice-cli.svg?style=flat-square)](https://codeclimate.com/github/ezekg/theme-juice-cli)
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ezekg/theme-juice-cli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Gitter](https://img.shields.io/gitter/room/ezekg/theme-juice-cli.svg?style=flat-square)](https://gitter.im/ezekg/theme-juice-cli)
 
 ![Theme Juice CLI](demo.gif)
 

data/lib/theme-juice/cli.rb

@@ -28,6 +28,8 @@ module ThemeJuice
         @env.vm_ip           = options[:vm_ip]
         @env.vm_prefix       = options[:vm_prefix]
         @env.from_path       = options[:from_path]
+        @env.from_srv        = options[:from_srv]
+        @env.inside_vm       = options[:inside_vm]
         @env.yolo            = options[:yolo]
         @env.boring          = options[:boring]
         @env.no_unicode      = options[:no_unicode]
@@ -61,6 +63,8 @@ module ThemeJuice
     class_option :vm_ip,           :type => :string,                           :default => nil, :desc => ""
     class_option :vm_prefix,       :type => :string,                           :default => nil, :desc => ""
     class_option :from_path,       :type => :string,  :aliases => "--in-path", :default => nil, :desc => ""
+    class_option :from_srv,        :type => :string,  :aliases => "--in-srv",  :default => nil, :desc => ""
+    class_option :inside_vm,       :type => :boolean, :aliases => "--in-vm",                    :desc => ""
     class_option :yolo,            :type => :boolean, :aliases => "--yes",                      :desc => ""
     class_option :boring,          :type => :boolean,                                           :desc => ""
     class_option :no_unicode,      :type => :boolean,                                           :desc => ""

data/lib/theme-juice/config.rb

@@ -13,7 +13,8 @@ module ThemeJuice
 
       commands.fetch("#{cmd}") {
         @io.error "Command '#{cmd}' not found in config", NotImplementedError }
-        .each { |c| run format_command(c, *args) }
+        .each { |c| cmds = format_command(c, *args)
+          @env.inside_vm ? run_inside_vm(cmds) : run(cmds) }
     rescue NoMethodError
       @io.say "Skipping...", :color => :yellow, :icon => :notice
     end
@@ -43,6 +44,15 @@ module ThemeJuice
       end
     end
 
+    def run_inside_vm(command)
+      project_dir = @env.from_srv || @project.vm_srv
+
+      @util.inside @env.vm_path do
+        @util.run "vagrant ssh -c 'cd #{project_dir} && #{command}'", {
+          :verbose => @env.verbose, :capture => @env.quiet }
+      end
+    end
+
     def format_command(cmd, args = [])
       if multi_arg_regex =~ cmd
         cmd.gsub! multi_arg_regex, args.join(" ")
@@ -61,6 +71,7 @@ module ThemeJuice
 
     def read_config
       @project.location ||= @env.from_path || Dir.pwd
+      @project.name ||= File.basename @project.location
 
       YAML.load_file Dir["#{@project.location}/*"].select { |f|
         config_regex =~ File.basename(f) }.last ||

data/lib/theme-juice/env.rb

@@ -9,6 +9,8 @@ module ThemeJuice
     attr_accessor :vm_ip
     attr_accessor :vm_prefix
     attr_accessor :from_path
+    attr_accessor :from_srv
+    attr_accessor :inside_vm
     attr_accessor :yolo
     attr_accessor :boring
     attr_accessor :no_unicode
@@ -43,6 +45,18 @@ module ThemeJuice
       @vm_prefix = val || ENV.fetch("TJ_VM_PREFIX") { "tj-" }
     end
 
+    def from_path=(val)
+      @from_path = val || ENV.fetch("TJ_FROM_PATH") { nil }
+    end
+
+    def from_srv=(val)
+      @from_srv = val || ENV.fetch("TJ_FROM_SRV") { nil }
+    end
+
+    def inside_vm=(val)
+      @inside_vm = val || ENV.fetch("TJ_INSIDE_VM") { false }
+    end
+
     def yolo=(val)
       @yolo = val || ENV.fetch("TJ_YOLO") { false }
     end

data/lib/theme-juice/man/tj

@@ -32,6 +32,14 @@ Force directory prefix for project in VM*
 Run Juicefile(5) commands from the passed path instead of the from current directory\.
 .
 .TP
+\fB\-\-from\-srv\fR, \fB\-\-in\-srv\fR=\fIpath\fR
+Run Juicefile(5) commands from the passed srv path instead of the from current directory when using the \fB\-\-inside\-vm\fR flag\.
+.
+.TP
+\fB\-\-inside\-vm\fR, \fB\-\-in\-vm\fR
+Run Juicefile(5) commands from inside of the virtual machine instead of your host machine\.
+.
+.TP
 \fB\-\-yolo\fR, \fB\-\-yes\fR
 Say yes to anything and everything, and maybe even get a few surprises
 .

data/lib/theme-juice/man/tj.txt

@@ -25,6 +25,14 @@ GLOBAL OPTIONS
 	      Run  Juicefile(5)  commands  from the passed path instead of the
 	      from current directory.
 
+       --from-srv, --in-srv=path
+	      Run Juicefile(5) commands from the passed srv  path  instead  of
+	      the from current directory when using the --inside-vm flag.
+
+       --inside-vm, --in-vm
+	      Run  Juicefile(5)  commands  from  inside of the virtual machine
+	      instead of your host machine.
+
        --yolo, --yes
 	      Say yes to anything and everything, and maybe  even  get	a  few
 	      surprises

data/lib/theme-juice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor