divide 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61c2bb7c29d7587d40f76bf342714e839bf1f579
-  data.tar.gz: d1fb8ec3ac33f6fa0424eb0e820f5078432e732d
+  metadata.gz: e2638293acbd8a4d7977f9f41d0efd5f503317ac
+  data.tar.gz: 972a61cb4e0c8037faefc8b2103a6e1cbed4159a
 SHA512:
-  metadata.gz: d889eb570a31453eebfb0ea9ec3071782e5a686ccdd5d05e6a17d1eedc42494c9abc6639103993ba2f168d85e4b5bb2d2b411bf39bc8dc78bd8581996860fca8
-  data.tar.gz: 0289c2c966d691a89850c063db86dc82446609037cd2a12ccbf121c200c166864011104ddcb98deb241e2bf85fdb8d4e1030a1f2daa0e56f1900320448972140
+  metadata.gz: 89c9dd0d15666f6953e29dc3f7c80fcba32e3ff728a5ea30eec616b43f4086229c33621090425e5e96701c696bce24a1b2d37aa739c30eded6dd12276f5e221c
+  data.tar.gz: fb17df6ab1db78fa3043e054333d0e548e80d2028153e01d98e7cc40921b6466075352951610c48654ff9377e344121e043d022fe2658ec98387fb09bbf61cc9

data/README.md

@@ -1,25 +1,70 @@
 # Divide
-Start Procfile processes in different Terminal.app tabs
+Start `Procfile` processes in different Terminal/iTerm tabs.
 
-## Installation
-```
+I’m well aware of [foreman][], but it starts all processes in the same tab which can be inconvenient.<br>
+I’m well aware of [tmux][], but obviously not everyone’s using it (if you do, check out [teamocil][]).
+
+## Usage
+```sh
 $ gem install divide
+$ divide
 ```
 
-## Usage
+## Options
+**Divide** is option-free. You may however overwrite any options of your `Procfile` processes by passing them to `divide`.
+
+```
+# Procfile
+web: bundle exec unicorn -c ./config/unicorn.rb
+```
+
+```sh
+$ divide -c ./another_folder/unicorn.rb
+# => bundle exec unicorn -c ./another_folder/unicorn.rb
+```
+
+### ENV
+**Divide** automatically loads `.env` file and overwrite any `$VARIABLE` of your processes.
+
+```
+# .env
+PORT=1337
+RACK_ENV=development
+```
 ```
+# Procfile
+web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb -E $RACK_ENV
+```
+
+```sh
 $ divide
-$ divide -p 1337
+# => bundle exec unicorn -p 1337 -c ./config/unicorn.rb -E development
 ```
-## License
-MIT (See [LICENSE][])
 
----
+### $PORT
+If you don’t specify a port, **Divide** will overwrite `$PORT` with 5000.
 
-I’m well aware of [foreman][], but it starts all processes in the same tab which can be inconvenient.<br>
-I’m well aware of [tmux][], but obviously not everyone’s using it (if you do, check out [teamocil][]).
+```
+# Procfile
+web: bundle exec rails s -p $PORT
+```
+
+```sh
+$ divide
+# => bundle exec rails s -p 5000
+```
+
+## Contributing
+Why yes! You’re welcome to submit any [issue][] or [pull request][] as long as everything’s green when you `bundle exec rake spec`. Meanwhile, you can give these folks a tap on the back for helping out:
+
+- [@remiprev](https://github.com/remiprev)
+
+## License
+Copyright © 2013 Etienne Lemay. See [LICENSE][] for details.
 
-[LICENSE]: /LICENSE.md
 [foreman]: https://github.com/dollar/foreman
 [tmux]: http://tmux.sourceforge.net
 [teamocil]: https://github.com/remiprev/teamocil
+[issue]: https://github.com/EtienneLem/divide/issues
+[pull request]: https://github.com/EtienneLem/divide/pulls
+[LICENSE]: /LICENSE.md

data/Rakefile

@@ -1,3 +1,15 @@
 # Rubygems
 require 'bundler'
+Bundler.require(:development)
+
 Bundler::GemHelper.install_tasks
+require "rspec/core/rake_task"
+
+# RSpec
+task :default => :spec
+
+desc "Run all specs"
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.pattern = "spec/**/*_spec.rb"
+  task.rspec_opts = "--colour --format=documentation"
+end

data/bin/divide

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
 
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+
 require 'divide'
-exit Divide.run(ARGV)
+Divide::CLI.new(ARGV)

data/divide.gemspec

@@ -1,13 +1,15 @@
 require File.expand_path('../lib/divide/version', __FILE__)
 
 spec = Gem::Specification.new do |s|
-  s.name = 'divide'
-  s.author = 'Etienne Lemay'
-  s.email = 'etienne@heliom.ca'
-  s.homepage = 'https://github.com/EtienneLem/'
-  s.summary = 'Start Procfile processes in different Terminal.app tabs'
+  s.name        = 'divide'
+  s.author      = 'Etienne Lemay'
+  s.email       = 'etienne@heliom.ca'
+  s.homepage    = 'https://github.com/EtienneLem/'
+  s.license     = 'MIT'
+  s.summary     = 'Divide Procfile processes'
+  s.description = 'Start Procfile processes in different Terminal.app tabs'
 
-  s.version = Divide::VERSION
+  s.version  = Divide::VERSION
   s.platform = Gem::Platform::RUBY
 
   s.files = %w(LICENSE.md README.md Rakefile divide.gemspec)
@@ -18,4 +20,6 @@ spec = Gem::Specification.new do |s|
   s.executables << 'divide'
 
   s.require_paths << 'lib'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', '~> 2.13'
 end

data/lib/divide.rb

@@ -1,29 +1,7 @@
 require 'divide/version'
 require 'divide/extractor'
-require 'divide/terminal_bridge'
+require 'divide/terminal_bridge/terminal'
+require 'divide/terminal_bridge/iterm'
+require 'divide/cli'
 
-module Divide
-  def self.run(argv)
-    @options = argv.each_slice(2).to_a
-    terminal.exec(processes)
-    1
-  end
-
-  def self.processes
-    no_profile unless extracted_processes = extractor.extract_processes!
-    extracted_processes.to_a.map { |a| a[1] }
-  end
-
-  def self.no_profile
-    puts "#{Dir.pwd}: There is no Procfile in this directory"
-    exit
-  end
-
-  def self.terminal
-    @terminal ||= Divide::TerminalBridge.new
-  end
-
-  def self.extractor
-    @extractor ||= Divide::Extractor.new(@options)
-  end
-end
+module Divide; end

data/lib/divide/cli.rb

@@ -0,0 +1,72 @@
+module Divide
+  class CLI
+    attr_reader :options
+
+    def initialize(argv=[])
+      @options = argv.each_slice(2).to_a
+
+      show_version if argv.grep(/^-v|--version$/).any?
+      show_help if argv.grep(/^-h|--help$/).any?
+
+      error(:app_not_supported) unless terminal
+
+      processes = extract_processes
+      start_processes(processes)
+    end
+
+    def start_processes(processes)
+      terminal.exec(processes)
+    end
+
+    def extract_processes
+      error(:no_procfile) unless extracted_processes
+      extracted_processes.to_a.map { |a| a[1] }
+    end
+
+    def error(type)
+      errors = {
+        no_procfile: "#{current_directory}: There is no Procfile in this directory",
+        app_not_supported: "#{current_app_name} is not yet supported, please fill in a request https://github.com/EtienneLem/divide/issues",
+      }
+
+      exit_with_message(errors[type], 1)
+    end
+
+    def show_version
+      exit_with_message("Divide #{VERSION}")
+    end
+
+    def show_help
+      exit_with_message("Usage: divide [options]")
+    end
+
+    def exit_with_message(message, code=0)
+      STDOUT.puts(message)
+      exit code
+    end
+
+    def current_app_name
+      @current_app_name ||= TerminalBridge.current_app_name
+    end
+
+    def extracted_processes
+      @extracted_processes ||= extractor.extract_processes!
+    end
+
+    def current_directory
+      @current_directory ||= Dir.pwd
+    end
+
+    def terminal
+      @terminal ||= case current_app_name.downcase
+                    when 'terminal' then TerminalBridge::Terminal.new
+                    when 'iterm' then TerminalBridge::ITerm.new
+                    else nil
+                    end
+    end
+
+    def extractor
+      @extractor ||= Extractor.new(@options)
+    end
+  end
+end

data/lib/divide/extractor.rb

@@ -1,34 +1,58 @@
 require 'yaml'
 
-class Divide::Extractor
-  def initialize(options=[])
-    @procfile_content = File.read('./Procfile') rescue ''
-    @options = options
+module Divide
+  class Extractor
+    DEFAULT_ENV = { 'PORT' => '5000' }.merge(ENV)
 
-    overwrite_options
-    overwrite_port
-  end
+    def initialize(options=[])
+      @options = options
+
+      overwrite_env_variables
+      overwrite_options
+    end
+
+    def procfile_content
+      @procfile_content ||= File.read('./Procfile') rescue ''
+    end
+
+    def env_content
+      @env_content ||= File.read('./.env') rescue ''
+    end
 
-  def overwrite_options
-    splitted_procfile = @procfile_content.split(/\s/)
+    def overwrite_options
+      splitted_content = procfile_content.split(/\s/)
 
-    @options.each do |option|
-      key = option[0]
-      value = option[1]
+      @options.each do |option|
+        next if option.length < 2
 
-      key_index = splitted_procfile.index(key)
-      value_to_overwrite = splitted_procfile[key_index + 1]
+        key = option[0]
+        value = option[1]
 
-      @procfile_content.sub!(value_to_overwrite, value)
+        if key_index = splitted_content.index(key)
+          value_to_overwrite = splitted_content[key_index + 1]
+          procfile_content.sub!(value_to_overwrite, value)
+        end
+      end
     end
-  end
 
-  def overwrite_port
-    @procfile_content.sub!('$PORT', ENV['PORT'] || '5000')
-  end
+    def extract_processes!
+      return nil if procfile_content.empty?
+      YAML.load(procfile_content)
+    end
 
-  def extract_processes!
-    return nil if @procfile_content.empty?
-    YAML.load(@procfile_content)
+    def env_variables
+      @env_variables ||= begin
+        env_content.split(/\n/).inject({}) do |memo, line|
+          variable, value = line.split(/=/)
+          memo.merge variable => value
+        end
+      end
+    end
+
+    def overwrite_env_variables
+      DEFAULT_ENV.merge(env_variables).each do |variable, value|
+        procfile_content.gsub!("$#{variable}", value)
+      end
+    end
   end
 end

data/lib/divide/terminal_bridge.rb

@@ -1,40 +1,68 @@
-class Divide::TerminalBridge
-  def apple_script(cmd)
-    cmd = cmd.join("' -e '") if cmd.is_a?(Array)
-    `osascript -e '#{cmd}'`
-  end
+module Divide
+  class TerminalBridge
+    attr_reader :app_name
 
-  def tell_terminal(cmd)
-    %(tell app "Terminal" to #{cmd})
-  end
+    # Class methods
+    def self.execute(command)
+      `#{command}`
+    end
 
-  def do_script(script)
-    tell_terminal %(do script "#{script}" in front window)
-  end
+    def self.apple_script(command)
+      command = command.join("' -e '") if command.is_a?(Array)
+      execute("osascript -e '#{command}'")
+    end
 
-  def keystroke(app, key)
-    splits = key.split('+')
+    def self.current_app_name
+      @current_app_name ||= apple_script('tell app "System Events" to get name of the first process whose frontmost is true').strip
+    end
 
-    if splits.length > 1
-      modifier_key = splits[0]
-      key = splits[1]
-    else
-      modifier_key = nil
-      key = splits[0]
+    # Instance methods
+    def initialize
+      @app_name = bridge.current_app_name
     end
 
-    modifier = modifier_key ? " using #{modifier_key} down" : ''
-    %(tell app "System Events" to tell process "#{app}" to keystroke "#{key}"#{modifier})
-  end
+    def bridge
+      @bridge ||= Divide::TerminalBridge
+    end
 
-  def exec(commands)
-    scripts = commands.map { |c| do_script(c) }
-    scripts_with_new_tabs = insert_between(scripts, keystroke('Terminal', 'command+t'))
+    def tell_current_app(cmd)
+      %(tell app "#{@app_name}" to #{cmd})
+    end
 
-    apple_script(scripts_with_new_tabs)
-  end
+    def open_new_tab_in_current_directory
+      [open_new_tab, go_to_current_directory]
+    end
 
-  def insert_between(scripts, insert_between)
-    scripts.flat_map { |s| [s, insert_between] }[0...-1]
+    def go_to_current_directory
+      do_script "cd #{Dir.pwd}"
+    end
+
+    def keystroke(key)
+      splits = key.split('+')
+
+      if splits.length > 1
+        modifier_key = splits[0]
+        key = splits[1]
+      else
+        modifier_key = nil
+        key = splits[0]
+      end
+
+      modifier = modifier_key ? " using #{modifier_key} down" : ''
+      %(tell app "System Events" to tell process "#{@app_name}" to keystroke "#{key}"#{modifier})
+    end
+
+    def exec(commands)
+      commands = Array(commands)
+
+      scripts = commands.map { |c| do_script(c) }
+      scripts_with_new_tabs = insert_between(scripts, open_new_tab_in_current_directory).flatten
+
+      bridge.apple_script(scripts_with_new_tabs)
+    end
+
+    def insert_between(array, insert_between)
+      array.flat_map { |a| [a, insert_between] }[0...-1]
+    end
   end
 end

data/lib/divide/terminal_bridge/iterm.rb

@@ -0,0 +1,13 @@
+require 'divide/terminal_bridge'
+
+module Divide
+  class TerminalBridge::ITerm < TerminalBridge
+    def do_script(script)
+      tell_current_app %(tell the first terminal to tell the last session to write text "#{script}")
+    end
+
+    def open_new_tab
+      tell_current_app %(tell the first terminal to launch session "Default Session")
+    end
+  end
+end

data/lib/divide/terminal_bridge/terminal.rb

@@ -0,0 +1,13 @@
+require 'divide/terminal_bridge'
+
+module Divide
+  class TerminalBridge::Terminal < TerminalBridge
+    def do_script(script)
+      tell_current_app %(do script "#{script}" in front window)
+    end
+
+    def open_new_tab
+      keystroke 'command+t'
+    end
+  end
+end

data/lib/divide/version.rb

@@ -1,3 +1,3 @@
 module Divide
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,16 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: divide
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Etienne Lemay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
-dependencies: []
-description: 
+date: 2013-05-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
+description: Start Procfile processes in different Terminal.app tabs
 email: etienne@heliom.ca
 executables:
 - divide
@@ -21,13 +49,17 @@ files:
 - README.md
 - Rakefile
 - divide.gemspec
+- lib/divide/cli.rb
 - lib/divide/extractor.rb
+- lib/divide/terminal_bridge/iterm.rb
+- lib/divide/terminal_bridge/terminal.rb
 - lib/divide/terminal_bridge.rb
 - lib/divide/version.rb
 - lib/divide.rb
 - bin/divide
 homepage: https://github.com/EtienneLem/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -49,5 +81,5 @@ rubyforge_project:
 rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
-summary: Start Procfile processes in different Terminal.app tabs
+summary: Divide Procfile processes
 test_files: []