divide 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 678c35e63c08b2bdc34ce6555ba2229ba92a155a
-  data.tar.gz: 3c585343af64d9c2cf868e61c00a6bc902ce6d60
+  metadata.gz: a512929f2f51c821651729499f439bcadda9fcfd
+  data.tar.gz: 7d08b96c59baca380ed17ae956003679fcfbd1d2
 SHA512:
-  metadata.gz: fa3c9bf15bf71dc747e29f1628e348d77694485f79f27a126de4a5676e14d368eb77ec650beed49edcb57b76b7d7bfb5f7425c94e62dde83793522494b4a4ea6
-  data.tar.gz: 42d1b2f90d05c3adcb16684bce08b4546c12807f2719b12b678714dd2ad08becf93aa5176d974d124082e142c75203a6d99fa1b842382adb15ca4217c71c07d1
+  metadata.gz: b1ce6bd4737fb526789730cbd9693917149c8878714a37f4c794a004c8ac364894aefc5af85f6725e4dfebe778af22bfb44092dd37b704b6f1f3c8e692db97a5
+  data.tar.gz: 3aa4ee48ea7f797dc79b399988710558ad2c429d275b1a60fa60a676b8b47e263822f405f19ca31914bd4c1d2b774d75d6c0585140c9aaee8a53e891916d5e07

data/README.md

@@ -57,6 +57,9 @@ $ divide
 ```
 
 ## Changelog
+### 0.1.3
+- Add :from option
+
 ### 0.1.2
 - Ignore `.env` file comments
 

data/bin/divide

@@ -3,4 +3,4 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'divide'
-Divide::CLI.new(ARGV)
+Divide::CLI.new(ARGV.dup)

data/lib/divide/cli.rb

@@ -1,12 +1,36 @@
 module Divide
   class CLI
     attr_reader :options, :flags
-    OPTIONS = %w(--tabs)
+    OPTIONS = %w(--tabs? --no-new-tab? --from)
 
     def initialize(argv=[])
       @options = {}
-      OPTIONS.each { |option| @options[option.sub('--', '').to_sym] = argv.include?(option) }
-      @flags = (argv - OPTIONS).each_slice(2).to_a
+      OPTIONS.each do |option|
+        is_boolean = option =~ /\?$/
+        option_name = option.sub('--', '')
+
+        if is_boolean
+          option.sub!(/\?$/, '')
+          option_name.sub!(/\?$/, '')
+
+          @options[option_name.to_sym] = argv.include?(option)
+          argv.delete(option)
+        elsif argv.include?(option)
+          value_index = argv.index(option) + 1
+
+          @options[option_name.to_sym] = argv[value_index]
+          argv.delete_at(value_index)
+          argv.delete(option)
+        end
+      end
+
+      if from = @options[:from]
+        @options[:from] = "#{Dir.pwd}/#{from}"
+      else
+        @options[:from] = Dir.pwd
+      end
+
+      @flags = (argv).each_slice(2).to_a
 
       show_version if argv.grep(/^-v|--version$/).any?
       show_help if argv.grep(/^-h|--help$/).any?
@@ -69,7 +93,7 @@ module Divide
     end
 
     def extractor
-      @extractor ||= Extractor.new(@flags)
+      @extractor ||= Extractor.new(@flags, @options)
     end
   end
 end

data/lib/divide/extractor.rb

@@ -4,24 +4,25 @@ module Divide
   class Extractor
     DEFAULT_ENV = { 'PORT' => '5000' }.merge(ENV)
 
-    def initialize(options=[])
+    def initialize(flags = [], options = {})
+      @flags = flags
       @options = options
 
       overwrite_env_variables
-      overwrite_options
+      overwrite_flags
       escape_double_quotes
     end
 
     def procfile_content
-      @procfile_content ||= File.read('./Procfile') rescue ''
+      @procfile_content ||= File.read("#{@options[:from]}/Procfile") rescue ''
     end
 
     def env_content
-      @env_content ||= File.read('./.env') rescue ''
+      @env_content ||= File.read("#{@options[:from]}/.env") rescue ''
     end
 
-    def overwrite_options
-      @options.each do |option|
+    def overwrite_flags
+      @flags.each do |option|
         next if option.length < 2
 
         key = option[0]

data/lib/divide/terminal_bridge.rb

@@ -35,7 +35,7 @@ module Divide
     end
 
     def go_to_current_directory
-      do_script "cd #{Dir.pwd}"
+      do_script "cd #{@options[:from]}"
     end
 
     def keystroke(key)
@@ -62,7 +62,8 @@ module Divide
 
       scripts = commands.map { |c| do_script(c) }
       scripts_with_new_tabs = insert_between(scripts, open_new_tab_in_current_directory).flatten
-      scripts_with_new_tabs << open_new_tab_in_current_directory
+      scripts_with_new_tabs.unshift(open_new_tab_in_current_directory) unless @options[:from] == Dir.pwd
+      scripts_with_new_tabs.push(open_new_tab_in_current_directory) unless @options[:'no-new-tab']
 
       bridge.apple_script(scripts_with_new_tabs)
     end

data/lib/divide/version.rb

@@ -1,3 +1,3 @@
 module Divide
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: divide
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Etienne Lemay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake