powder 0.1.8 → 0.2.0

data/Readme.md

@@ -64,6 +64,9 @@ powder manages [pow](http://pow.cx/)
     # Not the application log, but the pow log, available at
     # ~/Library/Logs/Pow/apps/#{app-directory}.log
 
+    $ powder debug
+    => Opens a debug shell with your application environment
+    
     $ powder open
     => Opens the pow link in a browser
     # aliased as powder -o
@@ -77,6 +80,18 @@ powder manages [pow](http://pow.cx/)
     # if you have set up alternative top level domains in .powconfig,
     # then the first listed domain will be opened.
 
+    $ powder open --browser Safari
+    => Opens the pow link in a specific browser (in this case, Safari)
+    # Also aliased as -b
+
+    $ powder open -b 'Google Chrome'
+    => Opens the pow link with browsers with more than one word
+
+    # Should also works with all the other 'open' options:
+    $ powder open bacon -b Safari
+    $ powder open --xip -b Firefox
+    $ powder -o -x -b 'Google Chrome'
+
     $ powder restart
     => Restart the current app
     # aliased as powder -r
@@ -95,6 +110,24 @@ powder manages [pow](http://pow.cx/)
     => Returns the current powder version
     # aliased as powder -v
 
+    $ powder env
+    => Displays your current custom pow environment variables
+    # Pow reads environment varialbles from .powenv
+
+    $ powder env_reset
+    => Deletes your .powevn, removing all custom environment variables.
+
+    $ powder env BACON chunky
+    => Pass an arbitrary environment variable to pow, eg, ENV["BACON"] = "chunky"
+    # Remove an ENV by passing in no value, eg: powder env BACON
+    # If you already have a .gitignore, the newly created .powenv will also be ignored automatically.
+
+    $ powder [production|development|test]
+    => Run your Rails app as Production
+    # aliased as powder [prod|dev]
+    # This is a wrapper for powder env RAILS_ENV ...
+
+    
 ### Install and uninstall Pow ###
 
     $ powder install
@@ -113,12 +146,11 @@ powder manages [pow](http://pow.cx/)
 
     $ powder up
     => Enable Pow
-
+	# aliased as powder start
+	
     $ powder down
     => Disable Pow
-
-    $ powder debug
-    => Opens a debug shell with your application environment
+	# aliased as powder stop
 
 # Contributors #
 

data/bin/powder

@@ -4,11 +4,13 @@ require 'rubygems'
 require 'thor'
 require 'fileutils'
 require 'net/https'
+require 'powder'
 require 'powder/version'
 
 module Powder
   class CLI < Thor
     include Thor::Actions
+    include Powder
     default_task :help
 
     map '-r' => 'restart'
@@ -21,10 +23,47 @@ module Powder
     map 'update' => 'install'
 
     POWDER_CONFIG = ".powder"
+    POW_ENV = ".powenv"
     POW_PATH = "#{ENV['HOME']}/.pow"
+    POW_CONFIG = "#{ENV['HOME']}/.powconfig"
     POW_DAEMON_PLIST_PATH="#{ENV['HOME']}/Library/LaunchAgents/cx.pow.powd.plist"
     POW_FIREWALL_PLIST_PATH = "/Library/LaunchDaemons/cx.pow.firewall.plist"
 
+    desc "env", "Pass an arbitrary environment variable to pow"
+    def env(key = nil, value = nil)
+      if key.nil?
+        show_env
+      else
+        value.nil? ? remove_env(key) : create_or_update_env(key, value)
+      end
+    end
+
+    desc "env_reset", "Remove all custom environment variables"
+    def env_reset
+      %x{rm .powenv && touch .powenv} if powenv_exists?
+    end
+
+    desc "test", "Run pow with RAILS_ENV=test"
+    def test
+      env("RAILS_ENV", "test")
+    end
+
+    desc "dev", "Run pow with RAILS_ENV=development"
+    def development
+      env("RAILS_ENV", "development")
+    end
+
+    desc "dev", "An alias to development"
+    alias :dev :development
+
+    desc "production", "Run pow with RAILS_ENV=production"
+    def production
+      env("RAILS_ENV", "production")
+    end
+
+    desc "prod", "An alias to production"
+    alias :prod :production
+
     desc "up", "Enable pow"
     def up
       if File.exists? POW_FIREWALL_PLIST_PATH
@@ -39,6 +78,9 @@ module Powder
       end
     end
 
+    desc "start", "An alias to up"
+    alias :start :up
+
     desc "down", "Disable pow"
     def down
       if File.exists? POW_FIREWALL_PLIST_PATH
@@ -62,6 +104,9 @@ module Powder
       end
     end
 
+    desc "stop", "An alias to down"
+    alias :stop :down
+
     desc "link", "Link a pow"
     method_option :force, :type => :boolean, :default => false, :alias => '-f', :desc => "remove the old configuration, overwrite .powder"
     method_option :"no-config", :type => :boolean, :default => false, :alias => '-n', :desc => "do not write a .powder file"
@@ -129,17 +174,19 @@ module Powder
 
     desc "list", "List current pows"
     def list
-      pows = Dir[POW_PATH + "/*"].map do |link|
-        realpath = File.readlink(link)
-        app_is_current = (realpath == Dir.pwd) ? '*' : ' '
-        [app_is_current, File.basename(link), realpath.gsub(ENV['HOME'], '~')]
+      pows = Dir[POW_PATH + "/*"].map do |link_or_port|
+        realpath_or_port = get_app_origin(link_or_port)
+        app_is_current = (realpath_or_port == Dir.pwd) ? '*' : ' '
+        [app_is_current, File.basename(link_or_port), realpath_or_port.gsub(ENV['HOME'], '~')]
       end
       print_table(pows)
     end
 
     desc "open", "Open a pow in the browser"
+    method_option :browser, :type => :string, :default => false, :aliases => '-b', :desc => 'browser to open with'
     method_option :xip, :type => :boolean, :default => false, :alias => '-x', :desc => "open xip.io instead of .domain"
     def open(name=nil)
+      browser = options.browser? ? "-a \'#{options.browser}\'" : nil 
       if options.xip?
         local_ip = '0.0.0.0'
         begin
@@ -151,9 +198,9 @@ module Powder
         ensure
           Socket.do_not_reverse_lookup = orig
         end
-        %x{open http://#{name || get_pow_name}.#{local_ip}.xip.io}
+        %x{open #{browser} http://#{name || get_pow_name}.#{local_ip}.xip.io}
       else
-        %x{open http://#{name || get_pow_name}.#{domain}}
+        %x{open #{browser} http://#{name || get_pow_name}.#{domain}}
       end
     end
 
@@ -212,7 +259,16 @@ module Powder
       Debugger.settings[:autoeval] = true
       Debugger.settings[:autolist] = 1
       Debugger.settings[:reload_source_on_change] = true
-      Debugger.start_client
+      connected = false
+      start = Time.now.to_i
+      while !connected && (Time.now.to_i - start) < 15
+        begin
+          Debugger.start_client && connected = true
+        rescue
+          next
+        end
+      end
+      say "Tried to connect for 15 seconds. Is the server ready for a debugger connection?" unless connected
     end
 
     desc "version", "Shows the version"
@@ -251,7 +307,8 @@ module Powder
 
     desc "config", "Shows current pow configuration"
     def config
-      results = %x{curl --silent -H host:pow localhost/config.json}.gsub(':','=>')
+      http_port = ":" + configured_pow_http_port.to_s
+      results = %x{curl --silent -H host:pow localhost#{http_port}/config.json}.gsub(':','=>')
       return say("Error: Cannot get Pow config. Pow may be down. Try 'powder up' first.") if results.empty? || !(results =~ /^\{/)
       json = eval results
       json.each do |k,v|
@@ -266,7 +323,8 @@ module Powder
 
     desc "status", "Shows current pow status"
     def status
-      results = %x{curl --silent -H host:pow localhost/status.json}.gsub(':','=>')
+      http_port = ":" + configured_pow_http_port.to_s
+      results = %x{curl --silent -H host:pow localhost#{http_port}/status.json}.gsub(':','=>')
       return say("Error: Cannot get Pow status. Pow may be down. Try 'powder up' first.") if results.empty? || !(results =~ /^\{/)
       json = eval results
       json.each {|k,v| say "#{k.ljust(12, ' ')} #{v}"}
@@ -292,6 +350,46 @@ module Powder
 
     private
 
+    def powenv_exists?
+      File.exists?(POW_ENV)
+    end
+
+    def show_env
+      if powenv_exists? && File.readlines(POW_ENV).any?
+        say %x{echo && cat #{POW_ENV} && echo}
+      else
+        say "\nYou haven't yet configured any custom environment variables for pow."
+        say "Try `powder env BACON chunky` to set ENV[\"BACON\"]=chunky"
+        say " or `powder env BACON` to remove ENV[\"BACON\"]"
+        say " or `powder prod` to set RAILS_ENV=production.\n\n"
+      end
+    end
+
+    def remove_env(key)
+      if powenv_exists? && File.readlines(POW_ENV).grep(/export #{key}=/).any?
+        %x{sed -i '' '/^export #{key}=.*$/d' #{POW_ENV}}
+      end
+    end
+
+    def create_or_update_env(key, value)
+      if exists = powenv_exists? && File.readlines(POW_ENV).grep(/export #{key}=/).any?
+        %x{sed -i '' 's/^export #{key}=.*$/export #{key}=#{value}/' #{POW_ENV}}
+        say "Modified #{POW_ENV}"
+      else
+        %x{echo "export #{key}=#{value}" >> #{POW_ENV} && touch tmp/restart.txt}
+        say "Appended to #{POW_ENV}"
+        gitignore POW_ENV unless exists
+      end
+    end
+
+    def gitignore(filename)
+      if File.exists?(".gitignore") && File.readlines(".gitignore").grep(Regexp.new(filename)).none?
+        %x{echo #{filename} >> .gitignore}
+        say "\nYou'll probably be wanting to .gitignore that new .powenv file..."
+        say "Here, let me take care of that for you.\n\n"
+      end
+    end
+
     def current_dir_name
       File.basename(%x{pwd}.chomp)
     end
@@ -307,6 +405,12 @@ module Powder
       return nil
     end
 
+    def configured_pow_http_port
+      return 20559 unless File.exists?(POW_CONFIG)
+
+      return File.open(POW_CONFIG).read.match(/export[\s]+POW_HTTP_PORT[\s]*=[\s]*(\d+)/) || 20559
+    end
+
     def current_dir_pow_name
       current_dir_name.tr('_', '-')
     end
@@ -388,7 +492,7 @@ module Powder
             create_file rails_initializer, get_gist(1135055)
           else
             create_file rack_initializer, get_gist(1262647)
-            append_to_file 'config.ru', "require 'rdebug.rb'"
+            append_to_file 'config.ru', "\nrequire 'rdebug.rb'"
           end
           restart
         else

data/lib/powder.rb

@@ -1,2 +1,12 @@
 module Powder
+  # Get the origin of the application link, whether it's a link to a
+  # rack app or proxy to a port.
+  def get_app_origin(app_link)
+    if File.symlink? app_link
+      File.readlink(app_link)
+    else
+      port = File.readlines(app_link)[0]
+      "proxy port: #{port}"
+    end
+  end
 end

data/lib/powder/version.rb

@@ -1,3 +1,3 @@
 module Powder
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

data/man/powder.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "POWDER" "1" "November 2011" "" ""
+.TH "POWDER" "1" "August 2012" "" ""
 .
 .SH "NAME"
 \fBpowder\fR \- manage Pow Rack server
@@ -63,6 +63,9 @@ powder will attempt to read \.powder, which names a default symlink for the curr
 => Create \.powder, contents bacon
 .
 .P
+\fB$ powder default\fR => Link the current dir to ~/\.pow/default # Serve this directory for all unhandled domains
+.
+.P
 For both forms of link, if the current directory doesn\'t look like an app that can be powed it will offer to download a basic \fBconfig\.ru\fR for Rails 2
 .
 .SS "Unlinking applications"
@@ -134,6 +137,15 @@ For both forms of link, if the current directory doesn\'t look like an app that
 .br
 # then the first listed domain will be opened\.
 .
+.P
+\fB$ powder open \-\-browser Safari\fR => Opens the pow link in a specific browser (in this case, Safari) # Also aliased as \-b
+.
+.P
+\fB$ powder open \-b \'Google Chrome\'\fR => Opens the pow link with browsers with more than one word
+.
+.P
+# Should also works with all the other \'open\' options: \fB$ powder open bacon \-b Safari\fR \fB$ powder open \-\-xip \-b Firefox\fR \fB$ powder \-o \-x \-b \'Google Chrome\'\fR
+.
 .SS "Managing application restarts"
 \fB$ powder restart\fR
 .
@@ -176,6 +188,18 @@ For both forms of link, if the current directory doesn\'t look like an app that
 .br
 # ~/Library/Logs/Pow/apps/#{app\-directory}\.log
 .
+.SS "Working with Environment Variables"
+\fB$ powder env\fR => Displays your current custom pow environment variables # Pow reads environment varialbles from \.powenv
+.
+.P
+\fB$ powder env_reset\fR => Deletes your \.powevn, removing all custom environment variables\.
+.
+.P
+\fB$ powder env BACON chunky\fR => Pass an arbitrary environment variable to pow, eg, ENV["BACON"] = "chunky" # Remove an ENV by passing in no value, eg: powder env BACON # If you already have a \.gitignore, the newly created \.powenv will also be ignored automatically\.
+.
+.P
+\fB$ powder [production|development|test]\fR => Run your Rails app as Production # aliased as powder [prod|dev] # This is a wrapper for powder env RAILS_ENV \.\.\.
+.
 .SS "Installing and uninstalling Pow"
 \fB$ powder install\fR
 .
@@ -215,5 +239,8 @@ For both forms of link, if the current directory doesn\'t look like an app that
 .br
 => Disable Pow
 .
+.P
+\fB$ powder debug\fR => Opens a debug shell with your application environment
+.
 .SH "AUTHOR"
 Built by rodreegez \fIhttps://github\.com/Rodreegez\fR and philnash \fIhttps://github\.com/philnash\fR\.

data/man/powder.1.html

@@ -111,6 +111,10 @@
   => Link the current dir to ~/.pow/bacon<br />
   => Create .powder, contents bacon</p>
 
+<p>  <code>$ powder default</code>
+  => Link the current dir to ~/.pow/default
+  # Serve this directory for all unhandled domains</p>
+
 <p>For both forms of link, if the current directory doesn't
 look like an app that can be powed it will offer to download
 a basic <strong>config.ru</strong> for Rails 2</p>
@@ -153,6 +157,18 @@ a basic <strong>config.ru</strong> for Rails 2</p>
   # if you have set up alternative top level domains in .powconfig,<br />
   # then the first listed domain will be opened.</p>
 
+<p>  <code>$ powder open --browser Safari</code>
+  => Opens the pow link in a specific browser (in this case, Safari)
+  # Also aliased as -b</p>
+
+<p>  <code>$ powder open -b 'Google Chrome'</code>
+  => Opens the pow link with browsers with more than one word</p>
+
+<p>  # Should also works with all the other 'open' options:
+  <code>$ powder open bacon -b Safari</code>
+  <code>$ powder open --xip -b Firefox</code>
+  <code>$ powder -o -x -b 'Google Chrome'</code></p>
+
 <h3 id="Managing-application-restarts">Managing application restarts</h3>
 
 <p>  <code>$ powder restart</code><br />
@@ -176,6 +192,25 @@ a basic <strong>config.ru</strong> for Rails 2</p>
   # Not the application log, but the pow log, available at<br />
   # ~/Library/Logs/Pow/apps/#{app-directory}.log</p>
 
+<h3 id="Working-with-Environment-Variables">Working with Environment Variables</h3>
+
+<p>  <code>$ powder env</code>
+  => Displays your current custom pow environment variables
+  # Pow reads environment varialbles from .powenv</p>
+
+<p>  <code>$ powder env_reset</code>
+  => Deletes your .powevn, removing all custom environment variables.</p>
+
+<p>  <code>$ powder env BACON chunky</code>
+  => Pass an arbitrary environment variable to pow, eg, ENV["BACON"] = "chunky"
+  # Remove an ENV by passing in no value, eg: powder env BACON
+  # If you already have a .gitignore, the newly created .powenv will also be ignored automatically.</p>
+
+<p>  <code>$ powder [production|development|test]</code>
+  => Run your Rails app as Production
+  # aliased as powder [prod|dev]
+  # This is a wrapper for powder env RAILS_ENV ...</p>
+
 <h3 id="Installing-and-uninstalling-Pow">Installing and uninstalling Pow</h3>
 
 <p>  <code>$ powder install</code><br />
@@ -198,6 +233,9 @@ a basic <strong>config.ru</strong> for Rails 2</p>
 <p>  <code>$ powder down</code><br />
   => Disable Pow</p>
 
+<p>  <code>$ powder debug</code>
+  => Opens a debug shell with your application environment</p>
+
 <h2 id="AUTHOR">AUTHOR</h2>
 
 <p>Built by <a href="https://github.com/Rodreegez">rodreegez</a> and <a href="https://github.com/philnash">philnash</a>.</p>
@@ -205,7 +243,7 @@ a basic <strong>config.ru</strong> for Rails 2</p>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>November 2011</li>
+    <li class='tc'>August 2012</li>
     <li class='tr'>powder(1)</li>
   </ol>
 

data/man/powder.1.ronn

@@ -38,7 +38,11 @@ powder will attempt to read .powder, which names a default symlink for the curre
   `$ powder link [bacon] --force`  
   => Remove the current pow symlink, and .powder  
   => Link the current dir to ~/.pow/bacon  
-  => Create .powder, contents bacon  
+  => Create .powder, contents bacon
+
+  `$ powder default`
+  => Link the current dir to ~/.pow/default
+  # Serve this directory for all unhandled domains
 
 For both forms of link, if the current directory doesn't
 look like an app that can be powed it will offer to download
@@ -82,6 +86,18 @@ a basic **config.ru** for Rails 2
   # if you have set up alternative top level domains in .powconfig,  
   # then the first listed domain will be opened.
 
+  `$ powder open --browser Safari`
+  => Opens the pow link in a specific browser (in this case, Safari)
+  # Also aliased as -b
+
+  `$ powder open -b 'Google Chrome'`
+  => Opens the pow link with browsers with more than one word
+
+  # Should also works with all the other 'open' options:
+  `$ powder open bacon -b Safari`
+  `$ powder open --xip -b Firefox`
+  `$ powder -o -x -b 'Google Chrome'`
+
 ### Managing application restarts
 
   `$ powder restart`  
@@ -105,6 +121,25 @@ a basic **config.ru** for Rails 2
   # Not the application log, but the pow log, available at  
   # ~/Library/Logs/Pow/apps/#{app-directory}.log
 
+### Working with Environment Variables
+
+  `$ powder env`
+  => Displays your current custom pow environment variables
+  # Pow reads environment varialbles from .powenv
+
+  `$ powder env_reset`
+  => Deletes your .powevn, removing all custom environment variables.
+
+  `$ powder env BACON chunky`
+  => Pass an arbitrary environment variable to pow, eg, ENV["BACON"] = "chunky"
+  # Remove an ENV by passing in no value, eg: powder env BACON
+  # If you already have a .gitignore, the newly created .powenv will also be ignored automatically.
+
+  `$ powder [production|development|test]`
+  => Run your Rails app as Production
+  # aliased as powder [prod|dev]
+  # This is a wrapper for powder env RAILS_ENV ...
+
 ### Installing and uninstalling Pow
 
   `$ powder install`  
@@ -127,6 +162,9 @@ a basic **config.ru** for Rails 2
   `$ powder down`  
   => Disable Pow
 
+  `$ powder debug`
+  => Opens a debug shell with your application environment
+
 ## AUTHOR
 
 Built by [rodreegez](https://github.com/Rodreegez) and [philnash](https://github.com/philnash).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: powder
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-09 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70120736475800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 0.11.5
   type: :runtime
   prerelease: false
-  version_requirements: *70120736475800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.11.5
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70120736474600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +38,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120736474600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Makes Pow even easier. I mean really, really, ridiculously easy.
 email:
 - 'no'
@@ -67,22 +77,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1995833865637283519
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1995833865637283519
 requirements: []
 rubyforge_project: powder
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Makes Pow even easier
 test_files: []
+has_rdoc: