powder 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 0.1.2 / TBA
+
+* X minor changes
+
+  * add up and down commands
+    ([commit](https://github.com/Rodreegez/powder/commit/e8775c166da40fad16d55df0022a61fd5d5af69b))
+  * add applog command
+    ([commit](https://github.com/Rodreegez/powder/commit/36d8e04aea2eac618611eaffe78ce8eb55eccc51))
+
 ### 0.1.2 / 2011-04-14 ###
 
 * 6 minor changes

data/Readme.md

@@ -6,6 +6,9 @@ powder manages [pow](http://pow.cx/)
 
 # Usage #
 
+
+### Linking apps in Pow ###
+
     $ powder
     => Link the current dir_name to ~/.pow/dir-name
     # if the dir_name has underscores in, powder changes them to hyphens
@@ -15,20 +18,26 @@ powder manages [pow](http://pow.cx/)
     # If the current directory doesn't look like an app that can be powed
     # by pow it will offer to download a basic config.ru for Rails 2
 
-    $ powder list
-    => List all the current apps linked in ~/.pow
-    # aliased as powder -l
-
-    $ powder restart 
-    => Restart the current app
-    # aliased as powder -r
-
     $ powder remove
     => Unlink current_dir
 
     $ powder remove bacon
     => Unlink bacon
 
+### Working with Pow ###
+
+    $ powder applog
+    => tail the log of the current app
+
+    $ powder list
+    => List all the current apps linked in ~/.pow
+    # aliased as powder -l
+
+    $ powder log
+    => Tails the pow log.
+    # Not the application log, but the pow log, available at
+    # ~/Library/Logs/Pow/apps/app-name
+
     $ powder open
     => Opens the pow link in a browser
     # aliased as powder -o
@@ -37,16 +46,17 @@ powder manages [pow](http://pow.cx/)
     => Opens http://bacon.dev in a browser
     # if you have set up alternative top level domains in .powconfig,
     # then the first listed domain will be opened.
-    
-    $ powder log
-    => Tails the pow log.
-    # Not the application log, but the pow log, available at
-    # ~/Library/Logs/Pow/apps/app-name
-    
+
+    $ powder restart 
+    => Restart the current app
+    # aliased as powder -r
+
     $ powder version
     => Returns the current powder version
     # aliased as powder -v
 
+### Install and uninstall Pow ###
+
     $ powder install
     => Installs pow server 
     # (I know, "curl get.pow.cx | sh" isn't hard, but this is _even_ easier)
@@ -54,19 +64,20 @@ powder manages [pow](http://pow.cx/)
     $ powder uninstall
     => Uninstalls pow server
 
-# Contributors #
+### Enable and Disable Pow ###
 
-Built by [rodreegez](https://github.com/Rodreegez) and [philnash](https://github.com/philnash).
+    $ powder up
+    => Enable Pow
+
+    $ powder down
+    => Disable Pow
 
-With contributions from:
+# Contributors #
 
-  * [franciscoj](https://github.com/franciscoj) 
-  * [cjkihlbom](https://github.com/cjkihlbom) 
-  * [pengwynn](https://github.com/pengwynn).
-  * [jmccartie](https://github.com/jmccartie)
-  * [fschwahn](https://github.com/fschwahn)
-  * [bob-p](https://github.com/bob-p)
+Built by [rodreegez](https://github.com/Rodreegez) and [philnash](https://github.com/philnash).
 
+Massive thanks to all our great
+[contributors](https://github.com/Rodreegez/powder/contributors)
 
 ## Copyright ##
 

data/bin/powder

@@ -16,15 +16,46 @@ module Powder
     map '-L' => 'link'
     map '-o' => 'open'
     map '-v' => 'version'
+    map 'update' => 'install'
 
-    POWPATH = "#{`echo ~`.chomp}/.pow"
+    POW_PATH = "#{ENV['HOME']}/.pow"
+    POW_DAEMON_PLIST_PATH="#{ENV['HOME']}/Library/LaunchAgents/cx.pow.powd.plist"
+    POW_FIREWALL_PLIST_PATH = "/Library/LaunchDaemons/cx.pow.firewall.plist"
+
+    desc "up", "Enable pow"
+    def up
+      if File.exists? POW_FIREWALL_PLIST_PATH
+        %x{sudo launchctl load /Library/LaunchDaemons/cx.pow.firewall.plist}
+      else
+        say "Pow firewall configuration missing."
+      end
+    end
+
+    desc "down", "Disable pow"
+    def down
+      if File.exists? POW_FIREWALL_PLIST_PATH
+        if not %x{sudo launchctl list | grep cx.pow.firewall}.empty?
+          %x{sudo launchctl unload /Library/LaunchDaemons/cx.pow.firewall.plist}
+        end
+        if ports = File.open(POW_FIREWALL_PLIST_PATH).read.match(/fwd .*?,([\d]+).*?dst-port ([\d]+)/)
+          http_port, dst_port = ports[1..2]
+        end
+      end
+      
+      http_port ||= 20559
+      dst_port ||= 80
+      
+      if rule = %x{sudo ipfw show | grep ",#{http_port} .* dst-port #{dst_port} in"}.split.first
+        %x{sudo ipfw delete #{rule} && sudo sysctl -w net.inet.ip.forwarding=0}
+      end
+    end
 
     desc "link", "Link a pow"
     def link(name=nil)
       return unless is_powable?
       current_path = %x{pwd}.chomp
       name ||= current_dir_pow_name
-      symlink_path = "#{POWPATH}/#{name}"
+      symlink_path = "#{POW_PATH}/#{name}"
       FileUtils.ln_s(current_path, symlink_path) unless File.exists?(symlink_path)
       say "Your application is now available at http://#{name}.#{domain}/"
     end
@@ -38,7 +69,7 @@ module Powder
 
     desc "list", "List current pows"
     def list
-      Dir[POWPATH + "/*"].map { |a| say File.basename(a) }
+      Dir[POW_PATH + "/*"].map { |a| say File.basename(a) }
     end
 
     desc "open", "Open a pow in the browser"
@@ -49,7 +80,7 @@ module Powder
     desc "remove", "Remove a pow"
     def remove(name=nil)
       return unless is_powable?
-      FileUtils.rm_f POWPATH + '/' + (name || current_dir_pow_name)
+      FileUtils.rm_f POW_PATH + '/' + (name || current_dir_pow_name)
     end
 
     desc "install", "Installs pow"
@@ -62,11 +93,16 @@ module Powder
       system "tail -f ~/Library/Logs/Pow/apps/#{name || current_dir_pow_name}.log"
     end
 
+    desc "applog", "Tails in current app"
+    def applog(env="development")
+      system "tail -f log/#{env}.log" if is_powable?
+    end
+
     desc "uninstall", "Uninstalls pow"
     def uninstall
       %x{curl get.pow.cx/uninstall.sh | sh}
     end
-  
+
     desc "version", "Shows the version"
     def version
        say "powder #{Powder::VERSION}"
@@ -101,7 +137,7 @@ module Powder
         return false
       end
     end
-  
+
     def is_rails2_app?
       File.exists?('config/environment.rb') && !`grep RAILS_GEM_VERSION config/environment.rb`.empty?
     end

data/lib/powder/version.rb

@@ -1,3 +1,3 @@
 module Powder
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: powder
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors: 
 - Phil Nash
@@ -16,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 +01:00
+date: 2011-05-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,11 +22,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 11
-        - 5
         version: 0.11.5
   type: :runtime
   version_requirements: *id001
@@ -69,23 +59,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: powder
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Makes Pow even easier