powder 0.3.0.pre4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de83ef5a6b218c71e71c9a79b8231732a645178b
-  data.tar.gz: 414b1caa88fb2d4a3958a57a4f24f4e3fcc7a01b
+  metadata.gz: ac798e222c9b018fedf3b22a706502cabcef8016
+  data.tar.gz: 74a5878bb50db929e7ba4d3c62155a7bb52bf0c3
 SHA512:
-  metadata.gz: 986a5d53c6773bac1a603440d0167be9c9d1759fccb12efe72f39a5569c229af5beb02d1e9f2df49b6b851bfd45d65a4fbecb5f53339abd3ffb408b875d8e176
-  data.tar.gz: 59e56d01b063789f3da56ad87ea906ea9a3f6babc83b54090ef40a77140377316d0e0cf73a6598a17913e7630e448543f8c6cd4b076b48986035f0bc871adc13
+  metadata.gz: a633242dab35c250901cbfe2073b0fe24df89e625adf60f66de7ef8643b6587aa6a93855942591056e68b10990fca40f29af7d63e98a4599e7b8eb63fbf98e7a
+  data.tar.gz: 6b9f222900fd9165f6e07e8c6e823e770b8bb781daac908435eb90592c480d27229c288f46c404d6942ce3669da24618a1731691fee24b54578b63fe7b981b10

data/CHANGELOG.md

@@ -1,11 +1,10 @@
-### 0.3.0.pre / 2014-10-22 ###
+### 0.3.0 / 2014-10-29 ###
 
 * 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.
+  * Support for OS X Yosemite. Powder reflects the changes in Pow.
+    Pow no longer uses the ipfw firewall, which was deprecated in OS X 10.9
+    and removed in 10.10.
 
 ### 0.2.2 / 2014-10-22 ###
 

data/bin/powder

@@ -76,6 +76,7 @@ module Powder
       else
         start_on_mavericks
       end
+      say "Pow has been started."
     end
 
     desc "start", "An alias to up"
@@ -85,32 +86,21 @@ module Powder
     def down
       if File.exists? POW_FIREWALL_PLIST_PATH
         if not %x{sudo launchctl list | grep cx.pow.firewall}.empty?
-          %x{sudo launchctl unload #{POW_FIREWALL_PLIST_PATH}}
+          %x{sudo launchctl unload #{POW_FIREWALL_PLIST_PATH} 2>/dev/null}
         end
       end
 
       if File.exists? POW_DAEMON_PLIST_PATH
-        %x{launchctl unload #{POW_DAEMON_PLIST_PATH}}
-      end
-
-      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
+        %x{launchctl unload #{POW_DAEMON_PLIST_PATH} 2>/dev/null}
       end
 
       if MAC_OS_X_MINOR_VERSION >= 10
-        %{sudo pfctl -a "com.apple/250.PowFirewall" -F all}
+        stop_on_yosemite
+      else
+        stop_on_mavericks
       end
+
+      say "Pow has been stopped."
     end
 
     desc "stop", "An alias to down"
@@ -535,18 +525,37 @@ module Powder
 
     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 bootstrap gui/"$UID" #{POW_DAEMON_PLIST_PATH} 2>/dev/null}
 
-      %x{launchctl enable gui/"$UID"/cx.pow.powd}
-      %x{launchctl kickstart -k gui/"$UID"/cx.pow.powd}
+      %x{launchctl enable gui/"$UID"/cx.pow.powd 2>/dev/null}
+      %x{launchctl kickstart -k gui/"$UID"/cx.pow.powd 2>/dev/null}
+    end
+
+    def stop_on_yosemite
+      %{sudo pfctl -a "com.apple/250.PowFirewall" -F all 2>/dev/null}
     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}}
+      %x{launchctl load #{POW_FIREWALL_PLIST_PATH} 2>/dev/null}
 
       return say "Pow daemon configuration missing." unless File.exists?(POW_DAEMON_PLIST_PATH)
-      %x{launchctl load #{POW_DAEMON_PLIST_PATH}}
+      %x{launchctl load #{POW_DAEMON_PLIST_PATH} 2>/dev/null}
+    end
+
+    def stop_on_mavericks
+      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
 
   end

data/lib/powder/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: powder
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre4
+  version: 0.3.0
 platform: ruby
 authors:
 - Phil Nash
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -74,9 +74,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: powder
 rubygems_version: 2.4.1