fresnel 0.5.5 → 0.5.6

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.5'
-  s.date         = '2009-12-07'
+  s.version      = '0.5.6'
+  s.date         = '2009-12-08'
   s.platform     = Gem::Platform::RUBY
   s.authors      = ["Gerard de Brieder", "Wes Oldenbeuving"]
   s.email        = "smeevil@gmail.com"

data/lib/fresnel/input_detector.rb

@@ -1,6 +1,6 @@
 class InputDetector
   attr_accessor :question, :possible_answers, :collection, :answer
-  
+
   def initialize(question,*answers)
     @question=question
     @possible_answers=Array.new
@@ -11,7 +11,16 @@ class InputDetector
     print question
     detect_answer
   end
-  
+
+  def self.pretty_prompt(inputs, *extras)
+    lines = inputs.keys.sort_by(&:to_s).map do |key|
+      choices = inputs[key].sort.map {|state| '[%s]%s' % [state[0,1], state[1..-1]]}.join(", ")
+      "#{key.to_s.capitalize}: #{choices}"
+    end
+    prompt = lines.join(".\n") + ": "
+    new(prompt, *extras)
+  end
+
   def detect_answer
     loop do
       begin
@@ -22,6 +31,8 @@ class InputDetector
       end
       print str.chr
       if str == 13
+        puts
+        exit if collection.blank?
         possible_options = possible_answers.select{|option| option == collection}
       else
         self.collection+=str.chr
@@ -31,7 +42,7 @@ class InputDetector
         if str==3
           puts
           puts "exiting due to ^c"
-          exit 
+          exit
         end
         puts
         puts "Invalid choice: #{collection}, choises are #{possible_answers.inspect}"

data/lib/fresnel/setup_wizard.rb

@@ -41,14 +41,9 @@ class SetupWizard
     data=fresnel.projects(:object=>true)
     current_dir=File.expand_path(".").split("/").last
     fresnel.projects(:selectable=>true, :clear=>false, :setup=>true)
-
-    project_id=ask("please select which project # resides here : ", Integer) do |q|
-       q.validate = /^\d+$/
-       q.below=data.size
-       q.responses[:ask_on_error]="This project is # : "
-     end
-     config['project_id']=data[project_id].id
-     puts "generated your config in #{fresnel.project_config_file}, going on with main program..."
-     File.open(fresnel.project_config_file,'w+'){ |f| f.write(YAML::dump(config)) }
+    project_id=InputDetector.new("please select which project # resides here : ", 0...data.size).answer
+    config['project_id']=data[project_id].id
+    puts "generated your config in #{fresnel.project_config_file}, going on with main program..."
+    File.open(fresnel.project_config_file,'w+'){ |f| f.write(YAML::dump(config)) }
   end
 end

data/lib/fresnel.rb

@@ -101,7 +101,7 @@ class Fresnel
     else
       puts(project_table)
       unless options[:setup]
-        action=InputDetector.new("[q]uit, [c]reate or project #",(0..(projects_data.size-1)).to_a).answer
+        action=InputDetector.new("[q]uit, [c]reate or project #",(0...projects_data.size).to_a).answer
         puts "action is #{action.inspect}"
         case action
           when "c" then create_project
@@ -152,8 +152,11 @@ class Fresnel
         end
       end
       puts tickets_table
-      action=InputDetector.new("[q]uit, [b]ins, [p]rojects, #{options[:all] ? "[u]nresolved" : "[a]ll"}, [c]reate or ticket #",tickets.map(&:number)).answer
+      action=InputDetector.new("[q]uit, [b]ins, [p]rojects, #{options[:all] ? "[u]nresolved" : "[a]ll"}, [c]reate , [r]efresh/[t]ickets or ticket # : ",tickets.map(&:number)).answer
       case action
+        when /t|r/ then
+          cache.clear(:name=>"fresnel_project_#{project_id}_tickets")
+          self.tickets
         when "b" then get_bins
         when "c" then create
         when "p" then projects(:selectable=>true)
@@ -165,7 +168,7 @@ class Fresnel
       end
     else
       puts Frame.new(:header=>"Notice",:body=>"no #{"unresolved " unless options[:all]}tickets #{"in bin #{options[:bin_name]}"}...")
-      action=InputDetector.new("[q]uit, [b]ins, [p]rojects, [u]nresolved, [a]ll, [c]reate").answer
+      action=InputDetector.pretty_prompt(:actions => %w[quit bins projects unresolved all create]).answer
       case action
         when "b" then get_bins
         when "c" then create
@@ -194,7 +197,7 @@ class Fresnel
       end
     end
     puts bins_table
-    bin_id=InputDetector.new("[q]uit or Bin #: ",(0..(bins.size-1)).to_a).answer
+    bin_id=InputDetector.new("[q]uit or Bin #: ",(0...bins.size).to_a).answer
     if bin_id=="q"
        exit(0)
     else
@@ -278,18 +281,22 @@ class Fresnel
       end
     end
     puts "Current state : #{ticket.versions.last.state}"
-    action=InputDetector.new("[q]uit, [t]ickets, [b]ins, [c]omment, [a]ssign, [r]esolve, [s]elf, [o]pen, [h]old, [w]eb, [l]inks").answer
+    choices = {
+      :states => %w[open resolved invalid hold new],
+      :actions => %w[quit tickets bins comments assign self web links]
+    }
+    states = choices[:states]
+    action=InputDetector.pretty_prompt(choices).answer
     case action
       when "t" then tickets
       when "b" then get_bins
       when "c" then comment(number)
       when "a" then assign(:ticket=>number)
-      when "r" then change_state(:ticket=>number,:state=>"resolved")
       when "s" then claim(:ticket=>number)
-      when "o" then change_state(:ticket=>number,:state=>"open")
-      when "h" then change_state(:ticket=>number,:state=>"hold")
       when "w" then open_browser_for_ticket(number)
       when "l" then links(number)
+      when *(states.map{|state| state[0,1]})
+        change_state(:ticket=>number,:state=>states.find{|state| state[0,1] == action})
       else
         exit(0)
     end
@@ -311,10 +318,7 @@ class Fresnel
         links.each_with_index{|link,i|t << [i,link]}
       end
       puts link_table
-      pick=ask("open link # : ", Integer) do |q|
-        q.below=links.size
-        q.above=-1
-      end
+      pick=InputDetector.new("open link # : ", (0...links.size).to_a).answer
       url=links[pick]
       url="http://#{url}" unless url=~/^http/
       `open '#{url}'`
@@ -326,6 +330,7 @@ class Fresnel
     puts "create comment for #{number}"
     ticket=get_ticket(number)
     File.open("/tmp/fresnel_ticket_#{number}_comment", "w+") do |f|
+      f.puts
       f.puts "# Please enter the comment for this ticket. Lines starting"
       f.puts "# with '#' will be ignored, and an empty message aborts the commit."
       `echo "q" | fresnel #{number}`.each{ |l| f.write "# #{l}" }
@@ -415,9 +420,6 @@ class Fresnel
   end
 
   def open_browser_for_ticket(number)
-    #fast
-    #`open "https://#{self.account}.lighthouseapp.com/projects/#{self.current_project_id}/tickets/#{number}"`
-    #or save
     puts "opening ticket #{number}in browser"
     `open "#{get_ticket(number).url}"`
     show_ticket(number)
@@ -434,10 +436,8 @@ class Fresnel
         end
       end
       puts members_table
-      pick=ask("Assign to # : ",Integer) do |q|
-        q.above=-1
-        q.below=members.count
-      end
+      #here
+      pick=InputDetector.new("Assign to user # : ",((0..members.size)-1)).answer
       options[:user_id]=members[pick].user.id
     end
     ticket=get_ticket(options[:ticket])
@@ -449,6 +449,7 @@ class Fresnel
     else
       puts Frame.new(:header=>"Error",:body=>"assigning failed !")
     end
+    show_ticket(options[:ticket])
   end
 
   def claim(options)
@@ -459,6 +460,6 @@ class Fresnel
     else
       assign(:ticket=>options[:ticket],:user_id=>self.current_user_id)
     end
-
+    show_ticket(options[:ticket])
   end
 end

metadata

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