powder 0.1.6 → 0.1.7

data/CHANGELOG.md

@@ -1,8 +1,19 @@
-### ??? ###
+### 0.1.7 ###
 
 * 1 minor change
+
+    * adds proper support for alt names
+      ([commit](https://github.com/Rodreegez/powder/commit/4b850b1dbb446f7d0c3a643d4cc7be99eebd417b))
+    * adds not_restarts command
+      ([commit](https://github.com/Rodreegez/powder/commit/9371ccdf822a83db7f1fded365d01bd2c613aed3))
+    * adds always_restart command
+      ([commit](https://github.com/Rodreegez/powder/commit/45bd64180930353ef6c45626ccae150091374828))
+    * pow down properly unloads pow processes
+      ([commit](https://github.com/Rodreegez/powder/commit/a6373e73c746587eb1ae23aaa1a26fe331274e6d))
+    * adds host/unhost for dealing with no network
+      ([commit](https://github.com/Rodreegez/powder/commit/547c3d1e2fbc155fea3c162a373fed017a739107))
     * Don't break config/status when pow is down
-      ([commit](https://github.com/Rodreegez/powder/commit/c3aa98943c51079e2e8a1dc0a983efe76e2964c7)))
+      ([commit](https://github.com/Rodreegez/powder/commit/c3aa98943c51079e2e8a1dc0a983efe76e2964c7))
 
 ### 0.1.5 / 2011-06-30 ###
 

data/Readme.md

@@ -9,21 +9,40 @@ powder manages [pow](http://pow.cx/)
 
 ### 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
+    powder will attempt to read .powder, which names a default symlink for the current project
 
-    $ powder link bacon
+    $ powder [-h|help]
+    => Display usage information
+    # Lists name and brief descriptions of the tasks available
+
+    $ powder link
+    => Link the current dir to ~/.pow/<current_directory>
+
+    $ powder link [bacon]
+    => Link the current dir to ~/.pow/bacon
+    => Create .powder, contents bacon
+
+    $ powder link [bacon] --no-create
+    => Link the current dir to ~/.pow/bacon
+
+    $ powder link [bacon] --force
+    => Remove the current pow symlink, and .powder
     => Link the current dir to ~/.pow/bacon
-    # 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
+    => Create .powder, contents bacon
+
+    # 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 config.ru for Rails 2
 
-    $ powder remove
-    => Unlink current_dir
+    $ powder unlink
+    => Unlink current_dir or the symlink defined in .powder
 
-    $ powder remove bacon
+    $ powder unlink bacon
     => Unlink bacon
 
+    $ powder cleanup
+    => remove all invalid symbolic links
+
 ### Working with Pow ###
 
     $ powder applog
@@ -45,7 +64,7 @@ powder manages [pow](http://pow.cx/)
     => Opens the pow link in a browser
     # aliased as powder -o
 
-    $ powder open bacon
+    $ powder open [bacon]
     => 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.
@@ -54,6 +73,13 @@ powder manages [pow](http://pow.cx/)
     => Restart the current app
     # aliased as powder -r
 
+    $ powder always_restart
+    => Always restart the current app
+    # aliased as powder -a
+
+    $ powder no_restarts
+    =>  don't do any automatic restarting of the current app
+
     $ powder status
     => Get Pow's current status information
 

data/bin/powder

@@ -9,15 +9,18 @@ require 'powder/version'
 module Powder
   class CLI < Thor
     include Thor::Actions
-    default_task :link
+    default_task :help
 
     map '-r' => 'restart'
+    map '-a' => 'always_restart'
     map '-l' => 'list'
     map '-L' => 'link'
+    map '-d' => 'default'
     map '-o' => 'open'
     map '-v' => 'version'
     map 'update' => 'install'
 
+    POWDER_CONFIG = ".powder"
     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"
@@ -25,39 +28,77 @@ module Powder
     desc "up", "Enable pow"
     def up
       if File.exists? POW_FIREWALL_PLIST_PATH
-        %x{sudo launchctl load /Library/LaunchDaemons/cx.pow.firewall.plist}
+        %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}}
+      else
+        say "Pow daemon 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}
+          %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 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"
+    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"
     def link(name=nil)
+      return unless is_powable?
+      if File.symlink?(POW_PATH)
+        current_path = %x{pwd}.chomp
+        if name
+          write_pow_config(name)
+        else
+          name = get_pow_name
+        end
+        symlink_path = "#{POW_PATH}/#{name}"
+        FileUtils.rm_f(symlink_path) if options[:force]
+        FileUtils.ln_s(current_path, symlink_path) unless File.exists?(symlink_path)
+        say "Your application is now available at http://#{name}.#{domain}/"
+      else
+        say "Pow is not installed."
+      end
+    end
+
+    desc "default", "Set this app as default"
+    def default(name=nil)
       return unless is_powable?
       current_path = %x{pwd}.chomp
-      name ||= current_dir_pow_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}/"
+      name ||= get_pow_name
+      symlink_path = "#{POW_PATH}/default"
+      FileUtils.rm_f symlink_path if File.exists?(symlink_path)
+      FileUtils.ln_sf(current_path, symlink_path)
+      say "Your application(#{name}) is now default at http://localhost/"
+    end
+
+    desc "un_default", "remove current default app"
+    def un_default(name=nil)
+      name ||= get_pow_name
+      symlink_path = "#{POW_PATH}/default"
+      FileUtils.rm_f symlink_path if File.exists?(symlink_path)
     end
 
     desc "restart", "Restart current pow"
@@ -67,20 +108,54 @@ module Powder
       %x{touch tmp/restart.txt}
     end
 
+    desc "always_restart", "Always restart current pow"
+    def always_restart
+      return unless is_powable?
+      FileUtils.mkdir_p('tmp')
+      %x{touch tmp/always_restart.txt}
+    end
+
+    desc "no_restarts", "Reset this app's restart settings"
+    def no_restarts
+      return unless is_powable?
+      FileUtils.rm_f Dir.glob('tmp/*restart.txt')
+    end
+
     desc "list", "List current pows"
     def list
-      Dir[POW_PATH + "/*"].map { |a| say File.basename(a) }
+      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'], '~')]
+      end
+      print_table(pows)
     end
 
     desc "open", "Open a pow in the browser"
     def open(name=nil)
-      %x{open http://#{name || current_dir_pow_name}.#{domain}}
+      %x{open http://#{name || get_pow_name}.#{domain}}
     end
 
-    desc "remove", "Remove a pow"
-    def remove(name=nil)
+    desc "unlink", "Unlink a pow app"
+    method_option :delete, :type => :boolean, :default => false, :alias => '-e', :desc => "delete .powder"
+    def unlink(name=nil)
       return unless is_powable?
-      FileUtils.rm_f POW_PATH + '/' + (name || current_dir_pow_name)
+      FileUtils.rm_f POW_PATH + '/' + (name || get_pow_name)
+      say "Successfully removed #{(name || get_pow_name)}"
+      if options[:delete]
+        FileUtils.rm_f POWDER_CONFIG
+        say "Successfully removed #{POWDER_CONFIG}"
+      end
+    end
+
+    desc "remove", "An alias to Unlink (depreciated)"
+    alias :remove :unlink
+
+    desc "cleanup", "Clean up invalid symbolic link"
+    def cleanup
+      Dir[POW_PATH + "/*"].map { |symlink|
+        FileUtils.rm(symlink) unless File.exists? File.readlink(symlink)
+      }
     end
 
     desc "install", "Installs pow"
@@ -112,7 +187,36 @@ module Powder
     def version
        say "powder #{Powder::VERSION}"
     end
-    
+
+    desc "host", "Updates hosts file to map pow domains to 127.0.0.1"
+    def host
+      hosts_file_path = "/etc/hosts"
+      pow_domain_records = Dir[POW_PATH + "/*"].map { |a| "127.0.0.1\t#{File.basename(a)}.#{domain}\t#powder" }
+      hosts_file = File.read("/etc/hosts").split("\n").delete_if {|row| row =~ /.+(#powder)/}
+      first_loopback_index = hosts_file.index {|i| i =~ /^(127.0.0.1).+/}
+      hosts_file = hosts_file.insert(first_loopback_index + 1, pow_domain_records)
+      File.open("#{ENV['HOME']}/hosts-powder", "w")  do
+        |file| file.puts hosts_file.join("\n")
+      end
+      %x{cp #{hosts_file_path} #{ENV['HOME']}/hosts-powder.bak}
+      %x{sudo mv #{ENV['HOME']}/hosts-powder #{hosts_file_path}}
+      %x{dscacheutil -flushcache}
+      say "Domains added to hosts file, old host file is saved at #{ENV['HOME']}/hosts-powder.bak"
+    end
+
+    desc "unhost", "Removes pow domains from hostfile"
+    def unhost
+      hosts_file_path = "/etc/hosts"
+      hosts_file = File.read("/etc/hosts").split("\n").delete_if {|row| row =~ /.+(#powder)/}
+      File.open("#{ENV['HOME']}/hosts-powder", "w")  do
+        |file| file.puts hosts_file.join("\n")
+      end
+      %x{cp #{hosts_file_path} #{ENV['HOME']}/hosts-powder.bak}
+      %x{sudo mv #{ENV['HOME']}/hosts-powder #{hosts_file_path}}
+      %x{dscacheutil -flushcache}
+      say "Domains removed from hosts file, old host file is saved at #{ENV['HOME']}/hosts-powder.bak"
+    end
+
     desc "config", "Shows current pow configuration"
     def config
       results = %x{curl --silent -H host:pow localhost/config.json}.gsub(':','=>')
@@ -137,15 +241,48 @@ module Powder
     end
 
     private
-    
+
     def current_dir_name
       File.basename(%x{pwd}.chomp)
     end
 
+    def configured_pow_name
+      return nil unless File.exists?(POWDER_CONFIG)
+
+      File.foreach(POWDER_CONFIG) do |line|
+        next if line =~ /^($|#)/
+        return line.chomp
+      end
+
+      return nil
+    end
+
     def current_dir_pow_name
       current_dir_name.tr('_', '-')
     end
 
+    def get_pow_name
+      configured_pow_name || current_dir_pow_name
+    end
+
+    def write_pow_config(name=nil)
+      return if ! name || options[:"no-config"]
+      powder_exists = File.exists?(POWDER_CONFIG)
+      configured_name = get_pow_name
+
+      unlink if powder_exists && configured_name != name
+
+      if options[:force] || ! powder_exists
+        File.open(POWDER_CONFIG, "w") do |f|
+          f.puts(name)
+        end
+        say "Created powder config #{POWDER_CONFIG}"
+      elsif !options[:force] && powder_exists && configured_name != name
+        say "Cowardly refusing to overwrite #{POWDER_CONFIG}"
+        exit 1
+      end
+    end
+
     def is_powable?
       if File.exists?('config.ru') || File.exists?('public/index.html')
         true
@@ -171,12 +308,12 @@ module Powder
     end
 
     def is_rails2_app?
-      File.exists?('config/environment.rb') && 
+      File.exists?('config/environment.rb') &&
         !`grep RAILS_GEM_VERSION config/environment.rb`.empty? ? 'Rails 2' : nil
     end
-    
+
     def is_radiant_app?
-      File.exists?('config/environment.rb') && 
+      File.exists?('config/environment.rb') &&
         !`grep Radiant::Initializer config/environment.rb`.empty? ? 'Radiant' : nil
     end
 

data/lib/powder/version.rb

@@ -1,3 +1,3 @@
 module Powder
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: powder
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
+  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors: 
 - Phil Nash
@@ -16,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 +01:00
+date: 2011-11-02 00:00:00 +00: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