fresnel 0.5.8 → 0.5.9

data/fresnel.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.name         = 'fresnel'
   s.summary      = "Fresnel is a console manager to LighthouseApp.com using the official lighthouse api."
   s.description  = s.summary
-  s.version      = '0.5.8'
-  s.date         = '2009-12-11'
+  s.version      = '0.5.9'
+  s.date         = '2010-01-03'
   s.platform     = Gem::Platform::RUBY
   s.authors      = ["Gerard de Brieder", "Wes Oldenbeuving"]
   s.email        = "smeevil@gmail.com"

data/lib/fresnel/lighthouse.rb

@@ -381,6 +381,4 @@ module ActiveResource
         (Lighthouse.email || Lighthouse.password ? { 'Authorization' => 'Basic ' + ["#{Lighthouse.email}:#{Lighthouse.password}"].pack('m').delete("\r\n") } : {})
       end
   end
-end
-
-
+end

data/lib/fresnel/setup_wizard.rb

@@ -31,8 +31,16 @@ class SetupWizard
     config['user_id']=ask("My lighthouse user_id is : ", Integer) do |q|
       q.default=user_id
     end
-
+    
+    puts "What are your commonly used tags ?"
+    puts "Please write them down like : [l]ow [m]edium [h]igh awe[s]ome"
+    puts "When adding tags you can give something like : special s design h"
+    puts "this will be expanded to : special awesome design high"
+    tags=ask("Tags : ")
+    config['tags']=tags.split(" ")
+    
     puts "generated your config in #{fresnel.global_config_file}, going on with main program..."
+    # TODO: Refactor GlobalConfig into its own object, responsible for loading and saving itself.
     File.open(fresnel.global_config_file,'w+'){ |f| f.write(YAML::dump(config)) }
   end
 
@@ -47,6 +55,7 @@ class SetupWizard
     else
       config['project_id']=data[project_id.to_i].id
       puts "generated your config in #{fresnel.project_config_file}, going on with main program..."
+      # TODO: Refactor ProjectConfig into its own object, responsible for loading and saving itself.
       File.open(fresnel.project_config_file,'w+'){ |f| f.write(YAML::dump(config)) }
     end
   end

data/lib/fresnel/string.rb

@@ -9,6 +9,10 @@ class String
   end
   
   def scrape_urls
-    scan(/(http|https)(:\/\/)([a-zA-Z0-9.\/_-]+)| (www\.[a-zA-Z0-9.\/_-]+)/).map{ |url| url.join}
+    scan(/(http|https)(:\/\/)([a-zA-Z0-9.\/_-]+\?[&=a-zA-Z0-9.\/_-]+)| (www\.[a-zA-Z0-9.\/_-]+)/).map{ |url| url.join}
+  end
+  
+  def scrape_textmate_links
+    scan(/(\.?\/.*?\.rb:\d+):in/)
   end
 end

data/lib/fresnel.rb

@@ -34,47 +34,56 @@ class Fresnel
     @app_description="A lighthouseapp console manager"
     @lighthouse=Lighthouse
     @cache=Cache.new
-    Lighthouse.account, Lighthouse.token, @current_user_id = load_global_config
-    @current_project_id=load_project_config
-
+    load_global_config
+    load_project_config
+    initialize_lighthouse
   end
 
   def load_global_config
-    if File.exists? self.global_config_file
-      config = YAML.load_file(self.global_config_file)
+    unless File.exists? self.global_config_file
+      puts Frame.new(:header=>"Notice",:body=>"global config not found at #{self.global_config_file}, starting wizard")
+      SetupWizard.global(self)
+      return load_global_config
+    end
 
-      @@cache_timeout=config['cache_timeout'] if config.has_key?('cache_timeout')
-      @@debug=config['debug'] if config.has_key?('debug')
-      @@term_size=config['term_size'] if config.has_key?('term_size')
+    config = YAML.load_file(self.global_config_file)
 
-      if config && config.class==Hash && config.has_key?('account') && config.has_key?('token') && config.has_key?('user_id')
-        return [config['account'], config['token'], config['user_id']]
-      else
-        puts Frame.new(:header=>"Warning !",:body=>"global config did not validate , recreating")
-        SetupWizard.global(self)
-        load_global_config
-      end
-    else
-      puts Frame.new(:header=>"Notice",:body=>"global config not found at #{self.global_config_file}, starting wizard")
+    @@cache_timeout=config['cache_timeout'] if config.has_key?('cache_timeout')
+    @@debug=config['debug'] if config.has_key?('debug')
+    @@term_size=config['term_size'] if config.has_key?('term_size')
+    @@tags=config['tags']
+    unless config && config.class==Hash && config.has_key?('account') && config.has_key?('token') && config.has_key?('user_id')  && config.has_key?('tags')
+      puts Frame.new(:header=>"Warning !",:body=>"global config did not validate , recreating")
       SetupWizard.global(self)
-      load_global_config
+      return load_global_config
     end
+
+    @lighthouse_account = config['account']
+    @lighthouse_token = config['token']
+    @current_user_id = config['user_id']
+    nil
+  end
+
+  def initialize_lighthouse
+    @lighthouse.account = @lighthouse_account
+    @lighthouse.token = @lighthouse_token
+    nil
   end
 
   def load_project_config
-    if File.exists? self.project_config_file
-      config = YAML.load_file(self.project_config_file)
-      if config && config.class==Hash && config.has_key?('project_id')
-        return config['project_id']
-      else
-        puts Frame.new(:header=>"Warning !",:body=>"project config found but project_id was not declared")
-        load_project_config
-      end
-    else
+    unless File.exists? self.project_config_file
       puts Frame.new(:header=>"Notice",:body=>"project config not found at #{self.project_config_file}, starting wizard")
       SetupWizard.project(self)
-      load_project_config
+      return load_project_config
+    end
+
+    config = YAML.load_file(self.project_config_file) || Hash.new
+    unless config['project_id']
+      puts Frame.new(:header=>"Warning !",:body=>"project config found but project_id was not declared")
+      return load_project_config
     end
+    @current_project_id = config['project_id']
+    nil
   end
 
   def account
@@ -100,7 +109,7 @@ class Fresnel
       license=InputDetector.new("License # : ",(0...LICENSES.size).to_a).answer
       license=LICENSES[license.to_i].first
     end
-    
+
     puts "collected :"
     puts "#{name} : #{license}"
     project = Lighthouse::Project.new(:name => name)
@@ -157,6 +166,7 @@ class Fresnel
     system("clear")
     options[:all] ? print("Fetching all tickets#{" in bin #{options[:bin_name]}" if options[:bin_name].present?}...") : print("Fetching unresolved tickets#{" in bin #{options[:bin_name]}" if options[:bin_name].present?}...")
     STDOUT.flush
+    @current_project_id=options[:project_id]||self.current_project_id
     project_id=options[:project_id]||self.current_project_id
     tickets=options[:tickets]||cache.load(:name=>"fresnel_project_#{project_id}_tickets#{"_all" if options[:all]}", :action=>"Lighthouse::Ticket.find(:all, :params=>{:project_id=>#{project_id} #{",:q=>'not-state:closed'" unless options[:all]}})")
     puts " [done] - data is #{tickets.age}s old , max is #{@@cache_timeout}s"
@@ -295,7 +305,7 @@ class Fresnel
     ticket = get_ticket(number)
     puts Frame.new(
       :header=>[
-        "Ticket ##{number} : #{ticket.title.chomp.truncate(55)}",
+        "Ticket ##{number} : #{ticket.title.chomp.truncate(@@term_size-5)}",
         "Date : #{DateParser.string(ticket.created_at.to_s)} by #{ticket.creator_name}",
         "Tags : #{ticket.tag}"
       ],
@@ -322,7 +332,7 @@ class Fresnel
     puts "Current state : #{ticket.versions.last.state}"
     choices = {
       :states => %w[open resolved invalid hold new],
-      :actions => %w[quit tickets bins comments assign self web links]
+      :actions => %w[quit tickets bins comments assign self web links errors]
     }
     states = choices[:states]
     action=InputDetector.pretty_prompt(choices).answer
@@ -334,6 +344,7 @@ class Fresnel
       when "s" then claim(:ticket=>number)
       when "w" then open_browser_for_ticket(number)
       when "l" then links(number)
+      when "e" then errors(number)
       when *(states.map{|state| state[0,1]})
         change_state(:ticket=>number,:state=>states.find{|state| state[0,1] == action})
       else
@@ -365,6 +376,30 @@ class Fresnel
     show_ticket(number)
   end
 
+  def errors(number)
+    ticket = get_ticket(number)
+    errors = ticket.versions.map{ |version| version.body.to_s.scrape_textmate_links }.flatten
+    if errors.size == 0
+      puts "No errors found"
+      sleep 1
+    elsif errors.size == 1
+      error=errors.first
+      error=~/(.*?):(\d+)/
+      `mate -l #{$2} #{File.expand_path(".")}#{$1.gsub(/^\./,"")}`
+    else
+      error_table=table do |t|
+        t.headings=['#','error']
+        errors.each_with_index{|error,i|t << [i,error]}
+      end
+      puts error_table
+      pick=InputDetector.new("open error # : ", (0...errors.size).to_a).answer
+      error=errors[pick.to_i]
+      error=~/(.*?):(\d+)/
+      `mate -l #{$2} #{File.expand_path(".")}#{$1.gsub(/^\./,"")}`
+    end
+    show_ticket(number)
+  end
+  
   def comment(number,state=nil)
     puts "create comment for #{number}"
     ticket=get_ticket(number)
@@ -413,16 +448,30 @@ class Fresnel
           body << l
         end
         body=body.to_s
-        tags=ask("Tags : ")
+        tags=ask("Tags #{@@tags.join(",")} : ")
         tags=tags.split(" ")
+        expanded_tags=[]
+        tags.each do |tag|
+          match=false
+          if tag.length==1
+            @@tags.each do |predefined_tag|
+              if predefined_tag=~/\[#{tag}\]/
+                match=true
+                expanded_tags<<predefined_tag.gsub(/\[|\]/,"")
+              end
+            end
+          end
+          expanded_tags<<tag unless match
+        end
       end
+      puts "tags are #{expanded_tags.inspect}"
       puts "creating ticket..."
       ticket = Lighthouse::Ticket.new(
         :project_id=>self.current_project_id,
         :title=>title,
         :body=>body
       )
-      ticket.tags=tags
+      ticket.tags=expanded_tags
       if ticket.save
         File.delete("/tmp/fresnel_new_ticket")
         show_ticket(ticket.number)
@@ -475,9 +524,8 @@ class Fresnel
         end
       end
       puts members_table
-      #here
-      pick=InputDetector.new("Assign to user # : ",((0..members.size)-1)).answer
-      options[:user_id]=members[pick].user.id
+      pick=InputDetector.new("Assign to user # : ",((0...members.size).to_a)).answer
+      options[:user_id]=members[pick.to_i].user.id
     end
     ticket=get_ticket(options[:ticket])
     ticket.assigned_user_id=options[:user_id]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fresnel
 version: !ruby/object:Gem::Version 
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors: 
 - Gerard de Brieder
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 00:00:00 +01:00
+date: 2010-01-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency