powder 0.2.2 → 0.3.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47afc8f55946584943545f9d35a8a591fc397370
-  data.tar.gz: f6c11ffca56fe7318abba5a9a91f4922e470eec6
+  metadata.gz: cfdbbad992ebcd320ce4f12389c1a09241cfdada
+  data.tar.gz: 08462e02316255b300c6e907c795efb971f6fa2e
 SHA512:
-  metadata.gz: 87a8f6197da9a67f3c1cbaab3e835a84f352c1c4ca816e22426c1613958ac964c4aacb81bf99fcbad2964c9c66f0c12bddc173d1e920e20e769521c5cd00488f
-  data.tar.gz: 681e4dd3cc812ec016b2cb797b4ff61ad1b5f2bfa2b5355b5a2a87dc3ded1a05c0b18ae46ef7b2016a6725d0d655f94973d41ce63dc6db087747544b7433675d
+  metadata.gz: c2d9cb7c30bbeefc83accae12db8805d93e9e6804d11832d85518309ae810300958fb9db3cdd5fa039d7d57578f435c99475030a699060f386a90ff9d0b95a53
+  data.tar.gz: 729300ebd70dbfac68187c4474c36605a7ae0ff4519d935d01f52a96ff79dbf7b11ff585cf9f564f6fe3585ddca9d9dad5eb1df9759a2aa0f4c55f89dbcf0c60

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 0.3.0.pre / 2014-10-22 ###
+
+* 1 minor change
+
+  * Support for OS X Yosemite. Pow no longer uses the ipfw firewall,
+    which was deprecated in OS X 10.9 and removed in 10.10. Port
+    redirection is now handled by the pf packet filter.
+    Powder reflects the same changes.
+
 ### 0.2.2 / 2014-10-22 ###
 
 * 1 minor change
@@ -18,11 +27,9 @@
   * Updates gist URLs
   ([commit](https://github.com/rodreegez/powder/commit/96af4fae93bd35a47a6cf0baa99f85aa739d0835))
 
-
-
 ### 0.2.0 / 2013-03-12 ###
 
-* 7 minor change
+* 7 minor changes
 
 	* fix debug command: rdebug connection errors
 	([commit](https://github.com/Rodreegez/powder/commit/3ea0a1bc68bd9517e5673cc64d8bf25f41a5e2de))

data/bin/powder

@@ -21,6 +21,12 @@ module Powder
     map '-o' => 'open'
     map '-v' => 'version'
 
+    MAC_OS_X_VERSION_REGEXP = /^(?<major_version>\d+)\.(?<minor_version>\d+)\.(?<patch_version>\d+)/
+    MAC_OS_X_MINOR_VERSION = begin
+      version_string = %x{sw_vers -productVersion}
+      version_string.match(MAC_OS_X_VERSION_REGEXP)[:minor_version].to_i
+    end
+
     POWDER_CONFIG = ".powder"
     POW_ENV = ".powenv"
     POW_PATH = "#{ENV['HOME']}/.pow"
@@ -65,15 +71,10 @@ module Powder
 
     desc "up", "Enable pow"
     def up
-      if File.exists? POW_FIREWALL_PLIST_PATH
-        %x{sudo launchctl load #{POW_FIREWALL_PLIST_PATH}}
-      else
-        say "Pow firewall configuration missing."
-      end
-      if File.exists? POW_DAEMON_PLIST_PATH
-        %x{launchctl load #{POW_DAEMON_PLIST_PATH}}
+      if MAC_OS_X_MINOR_VERSION >= 10
+        start_on_yosemite
       else
-        say "Pow daemon configuration missing."
+        start_on_mavericks
       end
     end
 
@@ -86,20 +87,29 @@ module Powder
         if not %x{sudo launchctl list | grep cx.pow.firewall}.empty?
           %x{sudo launchctl unload #{POW_FIREWALL_PLIST_PATH}}
         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
 
       if File.exists? POW_DAEMON_PLIST_PATH
         %x{launchctl unload #{POW_DAEMON_PLIST_PATH}}
       end
 
-      http_port ||= 20559
-      dst_port ||= 80
+      if MAC_OS_X_MINOR_VERSION < 10
+        if File.exists? POW_FIREWALL_PLIST_PATH
+          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
 
-      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}
+      if MAC_OS_X_MINOR_VERSION >= 10
+        %{sudo pfctl -a "com.apple/250.PowFirewall" -F all}
       end
     end
 
@@ -165,7 +175,6 @@ module Powder
       FileUtils.rm_f Dir.glob('tmp/*restart.txt')
     end
 
-
     desc "respawn", "Restart the pow process"
     def respawn
       %x{launchctl stop cx.pow.powd}
@@ -328,7 +337,7 @@ module Powder
     desc "status", "Shows current pow status"
     def status
       http_port = ":" + configured_pow_http_port.to_s
-      results = %x{curl --silent -H host:pow localhost#{http_port}/status.json}.gsub(':','=>')
+      results = %x{curl --silent -H host:pow 127.0.0.1#{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}"}
@@ -518,6 +527,24 @@ module Powder
       request = Net::HTTP::Get.new(uri.request_uri)
       http.request(request).body
     end
+
+    def start_on_yosemite
+      return say "Pow daemon configuration missing." unless File.exists?(POW_DAEMON_PLIST_PATH)
+      %x{launchctl bootstrap gui/"$UID" #{POW_DAEMON_PLIST_PATH}}
+
+      %x{launchctl enable gui/"$UID"/cx.pow.powd}
+      %x{launchctl kickstart -k gui/"$UID"/cx.pow.powd}
+    end
+
+    def start_on_mavericks
+      return say "Pow firewall configuration missing." unless File.exists?(POW_FIREWALL_PLIST_PATH)
+      %x{launchctl load #{POW_FIREWALL_PLIST_PATH}}
+
+      return say "Pow daemon configuration missing." unless File.exists?(POW_DAEMON_PLIST_PATH)
+      %x{launchctl load #{POW_DAEMON_PLIST_PATH}}
+    end
+
   end
 end
+
 Powder::CLI.start

data/lib/powder/version.rb

@@ -1,3 +1,3 @@
 module Powder
-  VERSION = "0.2.2"
+  VERSION = "0.3.0.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: powder
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0.pre
 platform: ruby
 authors:
 - Phil Nash
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -74,13 +74,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: powder
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Makes Pow even easier
 test_files: []
+has_rdoc: