bropages 0.0.15 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODA5ZTc2YTliMjllMTVlNmQ2NzI5ZTM1MjJlY2I4MTUyNmQzODQzZQ==
+    MzMwOWM3M2MzNDBhOTI1MWJjOThiN2IxOTczZDZmMGY3ZmIwYTYzNA==
   data.tar.gz: !binary |-
-    MTRhZmFkNWM2YmNmY2Q0NjBhYjhmY2ZhNzBhNmRkYTA2ZWI2MTUwNQ==
+    YWVmMjhmNjMwMGFiNWM2ODk0ZjI4NGJkMzBiNDg3NTk3YzVmYjlmMg==
 SHA512:
   metadata.gz: !binary |-
-    YTBjOWVkMmM2MDVjMGYwOGQxOGFmYTcxNTQ1Njc4NWIzZGNlMGNlZWNiN2Vj
-    YTM3ZmNkZjJiYjVhOGJjMWZhMjU3Zjg0NmU1MmQ1MWM2MmQ1ZmY1M2Q1MWFh
-    ODdlMTNiNmRjOTQ5YzBlM2MzMzRhNWZkMTIzMDlhNzg0NWVhYzg=
+    MzY5MDYwNzAyY2E0MzA5NDQ4ODhhMTIwZmJmMDYyMmI2ZDJiZWM5MTFmYjJh
+    YTQwMDMzYThhODZjM2NlMzUyODAxOGJkNjc1Zjk2MTBlNjMyZThiNDgzMDkx
+    MDk3ZjVkMjNjYzI2Nzg3MzJlMjdhMWQ4MTRkMThlYmQ0OGFkZjM=
   data.tar.gz: !binary |-
-    YjJhYzVkYTk2YTNkZmQ3Nzc4MTNjMDA4OTdkZjk5OTNkM2M3ZTNiZmUwMzRj
-    NzRlMmQ5MzgwN2FkYjM2NjEwYjY0MzFjMWFhNDU1NzllYmI4NDMxOTMxMDA1
-    ZmM5Y2JiMDIwMWJiZDE0MThkNDExYTNkNGEwNTAxOGJhMTk3M2I=
+    NTk3NWQ1ZGQzNmI1NDUwNzlmMTk5Y2ZlZDczMWNjZTEwZmNhNWUzMjEwNGM1
+    MDc5Njc0ZWY1Y2E5OTAwNGI2NGZjY2I1Y2RhMDQ4MDAwZTRjZjRmNWRmN2Vm
+    NjU2MGZkMGY1YTUwZWExNjNiZmMyZmNkNGJmMjQzZWYwZTVkOTc=

data/bin/bro

@@ -1,3 +1,2 @@
 #!/usr/bin/env ruby
-
-require 'bro'
+require 'bro'

data/lib/bro.rb

@@ -1,20 +1,28 @@
 #!/usr/bin/env ruby
+
+# 1.8.7 support
+unless Kernel.respond_to?(:require_relative)
+  module Kernel
+    def require_relative(path)
+      require File.join(File.dirname(caller[0]), path.to_str)
+    end
+  end
+end
+
 require 'rubygems'
 require 'json'
 require 'commander/import'
 require 'highline'
-require 'smart_colored'
 require 'rest-client'
 
-$LOAD_PATH << "."
 require_relative 'bro/state.rb'
 require_relative 'bro/bro_state.rb'
 require_relative 'bro/string_hacks.rb'
 require_relative 'bro/version.rb'
-include Bro
 
 URL = ENV["BROPAGES_URL"] || 'http://bropages.org'
 FILE = ENV["HOME"] + '/.bro'
+RestClient.proxy = ENV['http_proxy']
 
 program :name, 'bro'
 program :version, Bro::VERSION
@@ -23,6 +31,12 @@ default_command :lookup
 
 state = Bro::BroState.new({:file => FILE})
 
+if state.check_color
+  ColoredText.apply
+else
+  VanillaText.apply
+end
+
 command :thanks do |c|
   c.syntax = 'bro thanks [COMMAND]'
   c.summary = 'Upvote an entry, bro'
@@ -31,9 +45,8 @@ command :thanks do |c|
   c.action do |args, options|
     begin
       login_details = state.check_email
-    rescue => e
+    rescue Interrupt, StandardError
       say "Sorry, you can't do this without email verification".sorry
-      say "#{e}"
     end
     unless login_details.nil?
       cmd = state.read_state[:cmd]
@@ -50,12 +63,12 @@ command :thanks do |c|
       id = state.read_state[idkey.intern]
 
       if id.nil?
-        say "That id (#{idkey}) does not exist for #{cmd}, try another one".sorry
+        say "That index (#{idkey}) does not exist for #{cmd}, try another one".sorry
       end
 
       unless id.nil?
         begin
-          res = RestClient.get URL + "/thanks/#{id}", { params: login_details }
+          RestClient.get URL + "/thanks/#{id}", { :params => login_details }
         rescue => e
           say e.message
           say "There was a problem thanking the #{cmd} entry. This entry may not exist or bropages.org may be down".problem
@@ -76,9 +89,8 @@ noblock = lambda { |c|
   c.action do |args, options|
     begin
       login_details = state.check_email
-    rescue
+    rescue Interrupt, StandardError
       say "Sorry, you can't do this without email verification".sorry
-      say "#{e}"
     end
     unless login_details.nil?
 
@@ -101,7 +113,7 @@ noblock = lambda { |c|
 
       unless id.nil?
         begin
-          res = RestClient.get URL + "/no/#{id}", { params: login_details }
+          RestClient.get URL + "/no/#{id}", { :params => login_details }
         rescue => e
           say "There was a problem downvoting the #{cmd} entry. This entry may not exist or bropages.org may be down".problem
           say e
@@ -131,9 +143,8 @@ command :add do |c|
   c.action do |args, options|
     begin
       login_details = state.check_email
-    rescue => e
+    rescue Interrupt, StandardError
       say "Sorry, you can't do this without email verification".sorry
-      say e
     end
 
     unless login_details.nil?
@@ -156,12 +167,12 @@ command :add do |c|
           # your_comment_here
           your_command_here
           QQQ
-        entry = ask_editor prompt, "vim"
-        if entry.gsub(prompt, '').strip.length > 0
-          if agree "Submit this entry for #{cmd}? [Yn] "
+        entry = ask_editor prompt
+        if !entry.nil? && entry.gsub(prompt, '').strip.length > 0
+          if agree("Submit this entry for #{cmd}? [y/n] ") { |q| q.default = "yes" }
             say "All right, sending your entry...".status
             begin
-              res = RestClient.post URL + '/', login_details.merge({ entry: { cmd: cmd, msg: entry}, format: 'json', multipart: true })
+              RestClient.post URL + '/', login_details.merge({ :entry => { :cmd => cmd, :msg => entry}, :format => 'json', :multipart => true })
             rescue => e
               say e.message
               file = "/tmp/#{cmd}.bro"
@@ -195,7 +206,20 @@ command :lookup do |c|
   c.summary = 'Lookup an entry, bro. Or just call bro [COMMAND]'
   c.description = "This looks up entries in the http://bropages.org database."
   c.example 'Look up the bro entries for curl', 'bro curl'
+  c.option '--no-color', 'Switch colored output OFF'
+  c.option '--with-color', 'Switch colored output ON'
   c.action do |args, options|
+    unless options.no_color.nil?
+      # set no-color as default
+      state.write_state({ :color => Bro::BroState::COLOR_OFF })
+      VanillaText.apply
+    end
+    unless options.with_color.nil?
+      # set color as default
+      state.write_state({ :color => "" })
+      ColoredText.apply
+    end
+
     if args.empty?
       say <<-QQQ.unindent
       #{"Bro! Specify a command first!".colored.red}
@@ -215,13 +239,13 @@ command :lookup do |c|
       state.reset_lookup_ids()
 
       # write to ~/.bro file with last command
-      state.write_state({ cmd: cmd_display })
+      state.write_state({ :cmd => cmd_display })
 
       # connect to webservice for entry
       error = false
       begin
         res = RestClient.get URL + '/' + cmd + '.json'
-      rescue => e
+      rescue
         say <<-QQQ.unindent
         The #{cmd_display.colored.yellow} command isn't in our database.
         

data/lib/bro/bro_state.rb

@@ -1,17 +1,28 @@
 module Bro
   class BroState < State
+    COLOR_OFF = "nocolor"
+
+    # true/false if color should be used
+    def check_color
+      state = read_state
+      return state[:color] != COLOR_OFF
+    end
+
     def get_arg_or_last_command args
       cmd = args.join(" ")
       if args.empty?
         state = read_state
-        cmd = state[:cmd].strip
+        cmd = state[:cmd]
+        return nil if state.nil? or cmd.nil?
+        cmd.strip!
       end
       cmd
     end
 
     def reset_lookup_ids
       # drop all lookup ids
-      write_state read_state().keep_if { |x| !!!(x =~ /\d+/) }, true
+      new_state = read_state().delete_if { |k, v| !!(k =~ /\d+/) }
+      write_state(new_state, true)
     end
 
     def check_email
@@ -20,7 +31,7 @@ module Bro
       rescue => e
         prompt_email
       end
-      {code: read_state[:code], email: read_state[:email]}
+      { :code => read_state[:code], :email => read_state[:email]}
     end
 
     def prompt_email
@@ -28,36 +39,41 @@ module Bro
       
       email = ""
 
-      while is_invalid_email email
-        email = ask "What's your email address?".colored.green
-      end
-
       begin
-        res = RestClient.post URL + '/users.json', { user: { email: email }, format: 'json', multipart: true }
-      rescue => e
-        say "There was an error delivering to your email address. Please try again later".colored.yellow.on_red
-        raise e
-      else
-        say "Great! We're sending an email to #{email}".success
-
-        invalid_code = true
+        while is_invalid_email email
+          email = ask "What's your email address?".colored.green
+        end
         begin
-          code = ask "Please enter the verification code: "
+          email_param = CGI.escape(email)
+          res = RestClient.post URL + '/users.json', { :user => { :email => email_param }, :format => 'json', :multipart => true }
+        rescue => e
+          say "There was an error delivering to your email address. Please try again later".colored.yellow.on_red
+          raise e
+        else
+          say "Great! We're sending an email to #{email}".success
+
+          invalid_code = true
           begin
-            is_invalid_code code, email
-            invalid_code = false
-            say "Great! You're verified! FYI, your email and code are stored locally in ~/.bro".success
-            write_state({ email: email, code: code })
-          rescue => e
-            say "Woops, there was a problem verifying your email. Please try again".colored.yellow.on_red
-          end
-        end while invalid_code
+            code = ask "Please enter the verification code: "
+            begin
+              is_invalid_code code, email
+              invalid_code = false
+              say "Great! You're verified! FYI, your email and code are stored locally in ~/.bro".success
+              write_state({ :email => email, :code => code })
+            rescue => e
+              say "Woops, there was a problem verifying your email. Please try again".colored.yellow.on_red
+            end
+          end while invalid_code
+        end
+      rescue Interrupt
+        say "Canceled email verification".status
+        raise
       end
-      
     end
 
     def is_invalid_code code, email
-      res = RestClient.get URL + "/users/verify?code=#{code}&email=#{email}"
+      email_param = CGI.escape(email)
+      res = RestClient.get URL + "/users/verify?code=#{code}&email=#{email_param}"
     end
 
     def is_invalid_email email

data/lib/bro/string_hacks.rb

@@ -1,25 +1,63 @@
-class String
-  def unindent 
-    gsub(/^#{scan(/^\s*/).min_by{|l|l.length}}/, "")
-  end
+class FakeColor
+  def initialize(text); @text = text; end
 
-  def status
-    self.colored.yellow
+  %w{ red green yellow blue underline }.each do |m|
+    define_method(m){ @text }
   end
+end
 
-  def success
-    self.colored.green.bold
-  end
+class VanillaText
+  class << self
+    def apply
+      String.class_eval do
+        def colored
+          FakeColor.new self
+        end
+          
+        def unindent 
+          gsub(/^#{scan(/^\s*/).min_by{|l|l.length}}/, "")
+        end
+      end
 
-  def problem
-    self.colored.yellow_on_red_bold
+      %w{ status success problem sorry important underline }.each do |m|
+        String.class_eval do
+          define_method(m){ self }
+        end
+      end
+    end
   end
+end
 
-  def sorry
-    self.colored.red.bold
-  end
+class ColoredText
+  class << self 
+    def apply
+      String.class_eval do
+        require 'smart_colored'
+
+        def unindent 
+          gsub(/^#{scan(/^\s*/).min_by{|l|l.length}}/, "")
+        end
+
+        def status
+          self.colored.yellow
+        end
+
+        def success
+          self.colored.green.bold
+        end
+
+        def problem
+          self.colored.yellow_on_red_bold
+        end
+
+        def sorry
+          self.colored.red.bold
+        end
 
-  def important
-    self.colored.magenta
+        def important
+          self.colored.magenta
+        end
+      end
+    end
   end
-end
+end

data/lib/bro/version.rb

@@ -1,3 +1,3 @@
 module Bro
-	VERSION = "0.0.15"
+	VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bropages
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.1.0
 platform: ruby
 authors:
 - bropages.org
@@ -14,30 +14,30 @@ dependencies:
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.5
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,30 @@ dependencies:
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.20
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.19.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.19.0
 description: Highly readable supplement to man pages. Shows simple, concise examples
   for unix commands.
 email: info@bropages.org
@@ -88,12 +102,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/bro
 - lib/bro.rb
-- lib/bro/bro_state.rb
 - lib/bro/state.rb
+- lib/bro/bro_state.rb
 - lib/bro/string_hacks.rb
 - lib/bro/version.rb
+- bin/bro
 homepage: http://bropages.org
 licenses: []
 metadata: {}
@@ -113,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Bro