pagoda 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dc917c7bcad25175b5e0871c22d3616ae011ab1
-  data.tar.gz: 397b7e72ac1d2c13929391eff8896e58d2b0c95e
+  metadata.gz: f68dbfdee4fc21612c902e14ea8b90c792e37e6e
+  data.tar.gz: 4eb03823c3d5729c177afda1356eb684e475bb3a
 SHA512:
-  metadata.gz: 9b5ff0a8450d0430ec2f0659431f166c3795e7803c735130f8702fd95138f2725571b6d3b6be5e9e573ed91f644f6461af16b86c987cb953913b160fecee6038
-  data.tar.gz: 0101bfa5cb91c95885cc766da5946fb95ae73730c82c3cfda6796ef193a3cb294e80ad11cc79e868a9aebbac2f4824712de0252f73cef84f406e816cddf60028
+  metadata.gz: 4bce58317eae1fddcd86e2959d13c803230df8b374d03e4df5d0d4f739fee01d030e20bcd775d058bfd44271b5d147586242a07645294a7ced9b0a400f5c13b0
+  data.tar.gz: b9d42f6fdb5de37b0e3d8ee2f48fe6babd41dd842f4e909086e3a1129d61bfc98df68c6d73a2ecc037da2ccf09f1710d563c9a00ae8e79cecf878bb7e8f66249

data/lib/pagoda/cli/core_ext.rb

@@ -17,193 +17,4 @@ 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
+end

data/lib/pagoda/cli/helpers/app.rb

@@ -127,7 +127,7 @@ module Pagoda
           display "+> #{dname} has been successfully destroyed. RIP #{dname}."
           remove_app(my_app)
         else
-          if confirm ["Are you totally completely sure you want to delete #{dname} forever and ever?", "THIS CANNOT BE UNDONE! (y/n)"]
+          if confirm ["Are you totally completely sure you want to delete #{dname} forever and ever?", "THIS CANNOT BE UNDONE! "]
             display
             display "+> Destroying #{dname}"
             client.app_destroy(my_app)

data/lib/pagoda/cli/helpers/base.rb

@@ -1,4 +1,5 @@
 require 'pagoda-client'
+require 'highline/import'
 
 module Pagoda
   module Command
@@ -9,48 +10,12 @@ module Pagoda
       class << self
         include Pagoda::Helpers
         def ask_for_credentials
-          username = ask "Username: "
-          display "Password: ", false
-          password = running_on_windows? ? ask_for_password_on_windows : ask_for_password
+          username = ask("<%= color('Username: ', :blue) %>")
+          password = ask("<%= color('Password: ', :blue) %>") { |q| q.echo = '*' }
           # api_key =  Pagoda::Client.new(user, password).api_key
-          [username, password] # return
+          [username.to_s, password.to_s] # return
         end
 
-        def ask_for_password
-          echo_off
-          password = ask
-          puts
-          echo_on
-          return password
-        end
-
-        def ask_for_password_on_windows
-          require "Win32API"
-          char = nil
-          password = ''
-          
-          while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do
-            break if char == 10 || char == 13 # received carriage return or newline
-            if char == 127 || char == 8 # backspace and delete
-              password.slice!(-1, 1)
-            else
-              # windows might throw a -1 at us so make sure to handle RangeError
-              (password << char.chr) rescue RangeError
-            end
-          end
-          return password
-        end
-
-        def echo_off
-          silently(system("stty -echo"))
-        rescue
-        end
-
-        def echo_on
-          silently(system("stty echo"))
-        rescue
-        end
-                  
       end
       
       attr_reader :client
@@ -96,7 +61,7 @@ module Pagoda
         else
           if soft_fail
             display "I was unable to find your application name."
-            ask "what is the name of your application? "
+            ask "<%= color('what is the name of your application? ', :blue) %>"
           else
             error "Unable to find the app. please specify using -a or --app="
           end

data/lib/pagoda/cli/helpers.rb

@@ -15,13 +15,7 @@ module Pagoda
     end
 
     def display(msg="", newline=true, level=1)
-      indent = build_indent(level)
-      if newline
-        (running_on_windows?) ? puts("#{indent}#{msg}") : puts("#{indent}#{msg}".green)
-      else
-        (running_on_windows?) ? print("#{indent}#{msg}") : print("#{indent}#{msg}".green)
-        STDOUT.flush
-      end
+      say("<%= color('#{msg}', :green)%>")
     end
     
     def format_date(date)
@@ -29,43 +23,29 @@ module Pagoda
       date.strftime("%Y-%m-%d %H:%M %Z")
     end
 
-    def ask(message=nil, level=1)
-      (running_on_windows?) ? print("#{build_indent(level)}#{message}") : print("#{build_indent(level)}#{message}".blue)
-      STDOUT.flush
-      STDIN.gets.strip
-    end
+    # def ask(message=nil, level=1)
+    #   (running_on_windows?) ? print("#{build_indent(level)}#{message}") : print("#{build_indent(level)}#{message}".blue)
+    #   STDOUT.flush
+    #   STDIN.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? ", level=1)
       return true if ARGV.include? "-f"
       case message
       when Array
-        count = message.length
-        iteration = 0
-        message.each do |m|
-          if iteration == count - 1
-            (running_on_windows?) ? display("#{m} ", false, level) : display("#{m} ".blue, false, level)
-          else
-            (running_on_windows?) ? display("#{m} ", false, level) : display("#{m} ".blue, true, level)
-          end
-          iteration += 1
-        end
+        agree("<%= color('#{message.join("\n")}', :blue)%>")
       when String
-        (running_on_windows?) ? display("#{message} ", false, level) : display("#{message} ".blue, false, level)
+        agree("<%= color('#{message}', :blue)%>")
       end
-      ask.downcase == 'y'
     end
 
     def error(msg, exit=true, level=1)
-      indent = build_indent(level)
       STDERR.puts
       case msg
       when Array
-        (running_on_windows?) ? STDERR.puts("#{indent}** Error:") : STDERR.puts("#{indent}** Error:".red)
-        msg.each do |m|
-          (running_on_windows?) ? STDERR.puts("#{indent}** #{m}") : STDERR.puts("#{indent}** #{m}".red)
-        end
+        say("<%= color('#{msg.join("\n")}', :red)%>")
       when String
-        (running_on_windows?) ? STDERR.puts("#{indent}** Error: #{msg}") : STDERR.puts("#{indent}** Error: #{msg}".red)
+        say("<%= color(msg, :red)%>")
       end
       STDERR.puts
       exit 1 if exit
@@ -90,10 +70,10 @@ module Pagoda
       error "you do not have git installed on your computer" unless has_git?
       if git('remote').split("\n").include?(remote)
         display "Given remote (#{remote}) is already in use on this repo" 
-        remote = ask "what would you like to call the new remote? "
+        remote = ask("<%= color('what would you like to call the new remote? ', :blue) %>")
       end
       unless File.directory?(".git")
-        if confirm "git has not been initialized yet, would you like us to do this for you? (y/n)?"
+        if confirm "git has not been initialized yet, would you like us to do this for you? "
           display "git repo is being created in '#{Dir.pwd}'"
           git "init"
         else

data/lib/pagoda/cli/version.rb

@@ -1,5 +1,5 @@
 module Pagoda
   module CLI
-    VERSION = "0.7.3"
+    VERSION = "0.7.4"
   end
 end

data/pagoda.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rest-client"
   gem.add_dependency "gli", '~> 2.0.0'
   gem.add_dependency "websocket-client-simple"
-  # gem.add_dependency 'msgpack'
+  gem.add_dependency 'highline'
   # gem.add_dependency 'eventmachine'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagoda
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Lyon Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Pagoda Box User facing interface to improve workflow with Pagoda Box
 email:
 - lyon@pagodabox.com