pagoda 0.2.0 → 0.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pagoda (0.0.1)
+    pagoda (0.2.0)
       crack
       iniparse
       json_pure
@@ -34,6 +34,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  crack
+  iniparse
+  json_pure
   pagoda!
+  rest-client
   rspec
   webmock

data/lib/pagoda/command.rb

@@ -1,8 +1,11 @@
 require 'pagoda/helpers'
 require 'pagoda/tunnel_proxy'
 require 'pagoda/commands/base'
-
-Dir["#{File.dirname(__FILE__)}/commands/*.rb"].each { |c| require c }
+require 'pagoda/commands/auth'
+require 'pagoda/commands/app'
+require 'pagoda/commands/db'
+require 'pagoda/commands/help'
+require 'pagoda/commands/tunnel'
 
 module Pagoda
   module Command

data/lib/pagoda/commands/app.rb

@@ -193,7 +193,7 @@ module Pagoda::Command
         display
       else
         client.deploy(app, branch, commit)
-        display "+> deploying to match current branch and commit...", false
+        display "+> deploying current branch and commit...", false
         loop_transaction
         display "+> deployed"
         display

data/lib/pagoda/commands/base.rb

@@ -146,7 +146,7 @@ module Pagoda
       def extract_git_clone_url(soft=false)
         begin
           url = IniParse.parse( File.read("#{locate_app_root}/.git/config") )['remote "origin"']["url"]
-          raise unless url.match(/^git@github.com:.+\.git$/)
+          raise unless url.match(/^((git@github.com:)|(.*:)|((http|https):\/\/.*github.com\/)|(git:\/\/github.com\/))(.*)\/(.*).git$/i)
           url
         rescue Exception => e
           return false

data/lib/pagoda/helpers.rb

@@ -19,9 +19,9 @@ module Pagoda
     def display(msg="", newline=true, level=1)
       indent = build_indent(level)
       if newline
-        puts("#{indent}#{msg}")
+        puts("#{indent}#{msg}".green)
       else
-        print("#{indent}#{msg}")
+        print("#{indent}#{msg}".green)
         STDOUT.flush
       end
     end
@@ -59,7 +59,7 @@ module Pagoda
       gets.strip
     end
     
-    def confirm(message="Are you sure you wish to continue? (y/n)?", level=1)
+    def confirm(message="Are you sure you wish to continue? (y/n)?".blue, level=1)
       return true if args.include? "-f"
       case message
       when Array
@@ -67,14 +67,14 @@ module Pagoda
         iteration = 0
         message.each do |m|
           if iteration == count - 1
-            display("#{m} ", false, level)
+            display("#{m} ".blue, false, level)
           else
-            display("#{m} ", true, level)
+            display("#{m} ".blue, true, level)
           end
           iteration += 1
         end
       when String
-        display("#{message} ", false, level)
+        display("#{message} ".blue, false, level)
       end
       ask.downcase == 'y'
     end
@@ -84,12 +84,12 @@ module Pagoda
       STDERR.puts
       case msg
       when Array
-        STDERR.puts("#{indent}** Error:")
+        STDERR.puts("#{indent}** Error:".red)
         msg.each do |m|
-          STDERR.puts("#{indent}** #{m}")
+          STDERR.puts("#{indent}** #{m}".red)
         end
       when String
-        STDERR.puts("#{indent}** Error: #{msg}")
+        STDERR.puts("#{indent}** Error: #{msg}".red)
       end
       STDERR.puts
       exit 1 if exit
@@ -124,4 +124,194 @@ unless String.method_defined?(:shellescape)
       empty? ? "''" : gsub(/([^A-Za-z0-9_\-.,:\/@\n])/n, '\\\\\\1').gsub(/\n/, "'\n'")
     end
   end
+end
+
+
+class String
+
+  #
+  # Colors Hash
+  #
+  COLORS = {
+    :black          => 0,
+    :red            => 1,
+    :green          => 2,
+    :yellow         => 3,
+    :blue           => 4,
+    :magenta        => 5,
+    :cyan           => 6,
+    :white          => 7,
+    :default        => 9,
+    
+    :light_black    => 10,
+    :light_red      => 11,
+    :light_green    => 12,
+    :light_yellow   => 13,
+    :light_blue     => 14,
+    :light_magenta  => 15,
+    :light_cyan     => 16,
+    :light_white    => 17
+  }
+
+  #
+  # Modes Hash
+  #
+  MODES = {
+    :default        => 0, # Turn off all attributes
+    #:bright        => 1, # Set bright mode
+    :underline      => 4, # Set underline mode
+    :blink          => 5, # Set blink mode
+    :swap           => 7, # Exchange foreground and background colors
+    :hide           => 8  # Hide text (foreground color would be the same as background)
+  }
+  
+  protected
+  
+  #
+  # Set color values in new string intance
+  #
+  def set_color_parameters( params )
+    if (params.instance_of?(Hash))
+      @color = params[:color]
+      @background = params[:background]
+      @mode = params[:mode]
+      @uncolorized = params[:uncolorized]
+      self
+    else
+      nil
+    end
+  end
+  
+  public
+
+  #
+  # Change color of string
+  #
+  # Examples:
+  #
+  #   puts "This is blue".colorize( :blue )
+  #   puts "This is light blue".colorize( :light_blue )
+  #   puts "This is also blue".colorize( :color => :blue )
+  #   puts "This is light blue with red background".colorize( :color => :light_blue, :background => :red )
+  #   puts "This is light blue with red background".colorize( :light_blue ).colorize( :background => :red )
+  #   puts "This is blue text on red".blue.on_red
+  #   puts "This is red on blue".colorize( :red ).on_blue
+  #   puts "This is red on blue and underline".colorize( :red ).on_blue.underline
+  #   puts "This is blue text on red".blue.on_red.blink
+  #   puts "This is uncolorized".blue.on_red.uncolorize
+  #
+  def colorize( params )
+    return self unless STDOUT.isatty
+    
+    begin
+      require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/
+    rescue LoadError
+      raise 'You must gem install win32console to use colorize on Windows'
+    end
+    
+    color_parameters = {}
+
+    if (params.instance_of?(Hash))
+      color_parameters[:color] = COLORS[params[:color]]
+      color_parameters[:background] = COLORS[params[:background]]
+      color_parameters[:mode] = MODES[params[:mode]]
+    elsif (params.instance_of?(Symbol))
+      color_parameters[:color] = COLORS[params]
+    end
+    
+    color_parameters[:color] ||= @color ||= COLORS[:default]
+    color_parameters[:background] ||= @background ||= COLORS[:default]
+    color_parameters[:mode] ||= @mode ||= MODES[:default]
+
+    color_parameters[:uncolorized] ||= @uncolorized ||= self.dup
+   
+    # calculate bright mode
+    color_parameters[:color] += 50 if color_parameters[:color] > 10
+
+    color_parameters[:background] += 50 if color_parameters[:background] > 10
+
+    "\033[#{color_parameters[:mode]};#{color_parameters[:color]+30};#{color_parameters[:background]+40}m#{color_parameters[:uncolorized]}\033[0m".set_color_parameters( color_parameters )
+  end
+
+  #
+  # Return uncolorized string
+  #
+  def uncolorize
+    @uncolorized || self
+  end
+  
+  #
+  # Return true if sting is colorized
+  #
+  def colorized?
+    !defined?(@uncolorized).nil?
+  end
+
+  #
+  # Make some color and on_color methods
+  #
+  COLORS.each_key do | key |
+    next if key == :default
+
+    define_method key do
+      self.colorize( :color => key )
+    end
+    
+    define_method "on_#{key}" do
+      self.colorize( :background => key )
+    end
+  end
+
+  #
+  # Methods for modes
+  #
+  MODES.each_key do | key |
+    next if key == :default
+    
+    define_method key do
+      self.colorize( :mode => key )
+    end
+  end
+
+  class << self
+    
+    #
+    # Return array of available modes used by colorize method
+    #
+    def modes
+      keys = []
+      MODES.each_key do | key |
+        keys << key
+      end
+      keys
+    end
+
+    #
+    # Return array of available colors used by colorize method
+    #
+    def colors
+      keys = []
+      COLORS.each_key do | key |
+        keys << key
+      end
+      keys
+    end 
+
+    #
+    # Display color matrix with color names.
+    #
+    def color_matrix( txt = "[X]" )
+      size = String.colors.length
+      String.colors.each do | color |
+        String.colors.each do | back |
+         print txt.colorize( :color => color, :background => back )
+        end
+        puts " < #{color}"
+      end
+      String.colors.reverse.each_with_index do | back, index |
+        puts "#{"|".rjust(txt.length)*(size-index)} < #{back}"
+      end 
+      ""
+    end
+  end
 end

data/lib/pagoda/version.rb

@@ -1,3 +1,3 @@
 module Pagoda
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - lyon hill
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 -06:00
+date: 2011-06-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency