powder 0.1.1 → 0.1.2

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 tmp
+.rvmrc

data/CHANGELOG.md

@@ -0,0 +1,37 @@
+### 0.1.2 / 2011-04-14 ###
+
+* 6 minor changes
+
+  * add log command
+    ([commit](https://github.com/Rodreegez/powder/commit/140ef1fef456e3cbe266a2df61b03f3e9c403aeb))
+  * fix error when calling remove on a pow that does not exist 
+    ([commit](https://github.com/Rodreegez/powder/commit/948f7251153afaab7c881b312b094d9843919dcb))
+  * properly recognise rails 2 apps and display note accordingly
+    ([commit](https://github.com/Rodreegez/powder/commit/0445eb652ec824a7f84d12567539a7c2515341a2))
+  * bump dependency on Thor
+    ([commit](https://github.com/Rodreegez/powder/commit/493a8f84c27b94fcd24dc84168a47a7c399a9ba1))
+  * improve how we determin home dir
+    ([commit](https://github.com/Rodreegez/powder/commit/b2e70ca790420a06c21a7f4fc466c167c65fb173))
+  * adds version command 
+    ([commit](https://github.com/Rodreegez/powder/commit/3bb995e2ce5ee2f62735b681b2c15418438f2df4))
+
+### 0.1.1 / 2011-04-11 ###
+
+* 1 minor change
+
+  * We won't try reading ~/.powconfig if it doesn't exist
+
+### 0.1.0 / 2011-04-11 ###
+
+* 1 Major change
+
+  * The command has changed from pow to powder to allow pow to use the command
+  ([issue](https://github.com/Rodreegez/powder/issues/5))
+  
+* 1 minor change
+
+  * open and link now honour domains specified in .powconfig
+
+### 0.0.4 / 2011-04-08 ###
+
+* Early release with link, list, restart, remove, open, install and uninstall commands

data/Readme.md

@@ -7,49 +7,65 @@ powder manages [pow](http://pow.cx/)
 # Usage #
 
     $ powder
-    => link the current dir_name to ~/.pow/dir-name
+    => Link the current dir_name to ~/.pow/dir-name
     # if the dir_name has underscores in, powder changes them to hyphens
 
     $ powder link bacon
-    => link the current dir to ~/.pow/bacon
+    => 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
 
     $ powder list
-    => list all the current apps linked in ~/.pow
+    => List all the current apps linked in ~/.pow
     # aliased as powder -l
 
     $ powder restart 
-    => restart the current app
+    => Restart the current app
     # aliased as powder -r
 
     $ powder remove
-    => unlink current_dir
+    => Unlink current_dir
 
     $ powder remove bacon
-    => unlink bacon
+    => Unlink bacon
 
     $ powder open
-    => opens the pow link in a browser
+    => Opens the pow link in a browser
     # aliased as powder -o
 
     $ powder open bacon
-    => opens http://bacon.dev in a browser
+    => 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 version
+    => Returns the current powder version
+    # aliased as powder -v
 
     $ powder install
-    => installs pow server 
+    => Installs pow server 
     # (I know, "curl get.pow.cx | sh" isn't hard, but this is _even_ easier)
 
     $ powder uninstall
-    => uninstalls pow server
+    => Uninstalls pow server
 
 # Contributors #
 
 Built by [rodreegez](https://github.com/Rodreegez) and [philnash](https://github.com/philnash).
 
-With contributions from [franciscoj](https://github.com/franciscoj), [cjkihlbom](https://github.com/cjkihlbom) and [pengwynn](https://github.com/pengwynn).
+With contributions from:
+
+  * [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)
 
 
 ## Copyright ##

data/bin/powder

@@ -3,99 +3,119 @@
 require 'rubygems'
 require 'thor'
 require 'fileutils'
-require "net/https"
-
-class Powder < Thor
-  include Thor::Actions
-  default_task :link
-
-  map '-r' => 'restart'
-  map '-l' => 'list'
-  map '-L' => 'link'
-  map '-o' => 'open'
-
-  POWPATH = "/Users/#{`whoami`.chomp}/.pow"
-
-  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}"
-    FileUtils.ln_s(current_path, symlink_path) unless File.exists?(symlink_path)
-    say "Your application is now available at http://#{name}.#{domain}/"
-  end
+require 'net/https'
+require 'powder/version'
 
-  desc "restart", "Restart current pow"
-  def restart
-    return unless is_powable?
-    FileUtils.mkdir_p('tmp')
-    %x{touch tmp/restart.txt}
-  end
+module Powder
+  class CLI < Thor
+    include Thor::Actions
+    default_task :link
 
-  desc "list", "List current pows"
-  def list
-    Dir[POWPATH + "/*"].map { |a| say File.basename(a) }
-  end
+    map '-r' => 'restart'
+    map '-l' => 'list'
+    map '-L' => 'link'
+    map '-o' => 'open'
+    map '-v' => 'version'
 
-  desc "open", "Open a pow in the browser"
-  def open(name=nil)
-    %x{open http://#{name || current_dir_pow_name}.#{domain}}
-  end
+    POWPATH = "#{`echo ~`.chomp}/.pow"
 
-  desc "remove", "Remove a pow"
-  def remove(name=nil)
-    return unless is_powable?
-    FileUtils.rm POWPATH + '/' + (name || current_dir_pow_name)
-  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}"
+      FileUtils.ln_s(current_path, symlink_path) unless File.exists?(symlink_path)
+      say "Your application is now available at http://#{name}.#{domain}/"
+    end
 
-  desc "install", "Installs pow"
-  def install
-    %x{curl get.pow.cx | sh}
-  end
+    desc "restart", "Restart current pow"
+    def restart
+      return unless is_powable?
+      FileUtils.mkdir_p('tmp')
+      %x{touch tmp/restart.txt}
+    end
 
-  desc "uninstall", "Uninstalls pow"
-  def uninstall
-    %x{curl get.pow.cx/uninstall.sh | sh}
-  end
+    desc "list", "List current pows"
+    def list
+      Dir[POWPATH + "/*"].map { |a| say File.basename(a) }
+    end
 
-  private
+    desc "open", "Open a pow in the browser"
+    def open(name=nil)
+      %x{open http://#{name || current_dir_pow_name}.#{domain}}
+    end
 
-  def current_dir_pow_name
-    File.basename(%x{pwd}.chomp).tr('_', '-')
-  end
+    desc "remove", "Remove a pow"
+    def remove(name=nil)
+      return unless is_powable?
+      FileUtils.rm_f POWPATH + '/' + (name || current_dir_pow_name)
+    end
 
-  def is_powable?
-    if File.exists?('config.ru') || File.exists?('public/index.html')
-      true
-    else
-      say "This does not appear to be a rack app as there is no config.ru."
-      say "Pow can also host static apps if there is an index.html in public/"
-      say "If you are in a Rails 2 application, you need a config.ru file"
-      if yes? "Do you want to autogenerate a basic config.ru for Rails 2?"
-        uri = URI.parse("https://gist.github.com/909308.txt")
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        request = Net::HTTP::Get.new(uri.request_uri)
-        create_file "config.ru",  http.request(request).body
-        return true
+    desc "install", "Installs pow"
+    def install
+      %x{curl get.pow.cx | sh}
+    end
+
+    desc "log", "Tails the Pow log"
+    def log(name=nil)
+      system "tail -f ~/Library/Logs/Pow/apps/#{name || current_dir_pow_name}.log"
+    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}"
+    end
+
+    private
+
+    def current_dir_pow_name
+      File.basename(%x{pwd}.chomp).tr('_', '-')
+    end
+
+    def is_powable?
+      if File.exists?('config.ru') || File.exists?('public/index.html')
+        true
+      elsif is_rails2_app?
+        say "This appears to be a Rails 2 applicaton. You need a config.ru file."
+        if yes? "Do you want to autogenerate a basic config.ru for Rails 2?"
+          uri = URI.parse("https://gist.github.com/909308.txt")
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          request = Net::HTTP::Get.new(uri.request_uri)
+          create_file "config.ru",  http.request(request).body
+          return true
+        else
+          say "Did not create config.ru"
+          return false
+        end
       else
-        say "Did not create config.ru"
+        say "This does not appear to be a rack app as there is no config.ru."
+        say "Pow can also host static apps if there is an index.html in public/"
         return false
       end
     end
-  end
+  
+    def is_rails2_app?
+      File.exists?('config/environment.rb') && !`grep RAILS_GEM_VERSION config/environment.rb`.empty?
+    end
 
-  def domain
-    if File.exists? '~/.powconfig'
-      returned_domain = %x{source ~/.powconfig; echo $POW_DOMAINS}.gsub("\n", "").split(",").first
-      returned_domain = %x{source ~/.powconfig; echo $POW_DOMAIN}.gsub("\n", "") if returned_domain.nil? || returned_domain.empty?
-      returned_domain = 'dev' if returned_domain.nil? || returned_domain.empty?
-      returned_domain
-    else
-      'dev'
+    def domain
+      if File.exists? '~/.powconfig'
+        returned_domain = %x{source ~/.powconfig; echo $POW_DOMAINS}.gsub("\n", "").split(",").first
+        returned_domain = %x{source ~/.powconfig; echo $POW_DOMAIN}.gsub("\n", "") if returned_domain.nil? || returned_domain.empty?
+        returned_domain = 'dev' if returned_domain.nil? || returned_domain.empty?
+        returned_domain
+      else
+        'dev'
+      end
     end
   end
 end
-Powder.start
+Powder::CLI.start

data/lib/powder/version.rb

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

data/powder.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.executables   = ["powder"]
   s.require_paths = ["lib"]
 
-  s.add_dependency 'thor', '>=0.9.2'
+  s.add_dependency 'thor', '>=0.11.5'
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: powder
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.1
+  hash: 31
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Phil Nash
@@ -11,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 +01:00
+date: 2011-04-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +27,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        hash: 57
+        segments: 
+        - 0
+        - 11
+        - 5
+        version: 0.11.5
   type: :runtime
   version_requirements: *id001
 description: Makes Pow even easier. I mean really, really, ridiculously easy.
@@ -36,7 +46,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
-- CHANGELOG
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - Rakefile
@@ -59,17 +69,23 @@ 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.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Makes Pow even easier

data/CHANGELOG

@@ -1,19 +0,0 @@
-=== 0.1.1 / 2011-04-11
-
-* 1 minor change
-  * We won't try reading ~/.powconfig if it doesn't exist
-
-=== 0.1.0 / 2011-04-11
-
-* 1 Major change
-
-  * The command has changed from pow to powder to allow pow to use the command
-  (https://github.com/Rodreegez/powder/issues/5)
-  
-* 1 minor change
-
-  * open and link now honour domains specified in .powconfig
-
-=== 0.0.4 / 2011-04-08
-
-* Early release with link, list, restart, remove, open, install and uninstall commands