ric 0.11.13 → 0.11.14

data/HISTORY.yml

@@ -1,4 +1,6 @@
 # would like to have this in YML format :)
+2011-02-06 v0.11.14:
+ - septober v0.9.8 with timeout and :edit
 2011-02-06 v0.11.13:
  - septober v0.9.7 with better CLI
  - reengineering septober yaml and help...

data/Manifest

@@ -24,6 +24,7 @@ lib/ruby_classes/arrays.rb
 lib/ruby_classes/strings.rb
 lib/tmp/uniquify.rb
 rails/init.rb
+ric.gemspec
 sbin/reboot.rb
 sbin/ric_reboot.rb
 test/sample_conf.yml

data/VERSION

@@ -1 +1 @@
-0.11.13
+0.11.14

data/bin/septober

@@ -11,14 +11,20 @@
 	@tags:      development, rcarlesso
   @synopsis:  This connects to septober websites. For more info, look here
   @description:
-   septober.heroku.com client to add and list todos!
+    septober.heroku.com client to add and list todos!
    
-   TODO
-   - add --context|-x : to change context (--local => --context 'local' , default: "septober" )
-   
-   API: add actions (done, toggle, ..., due <today|tomorrow|monday> )
+    TODO
+    - add --context|-x : to change context (--local => --context 'local' , default: "septober" )
    
+    API: add actions (done, toggle, ..., due <today|tomorrow|monday> )
+  ###########################################################
+=end
+
+  $PROG_VER = '0.9.8'
+
+=begin
   @history:
+    0.9.8 2011-02-10 Added timeout (works) and a broken prototype for :edit
     0.9.7 2011-02-09 mini banner WITH version (not to get nuts again thru versions!). --conf now works!
     0.9.6 2011-02-09 CLI supports --conf now. Tags working!
     0.9.5 2011-02-08 more concise 'add'
@@ -26,9 +32,8 @@
     0.9.3 2011-02-04 better 'list'    
     0.9.2 2011-02-04 'add' operation succefully added!   
     0.9.1 2011-01-18 First version
- ############################################################
 =end
-  $PROG_VER = '0.9.7'
+  
 
   require 'optparse'       
   require 'rubygems'
@@ -46,21 +51,25 @@
     :septober_url        => 'http://septober.heroku.com/' , 
     :dflt_config_file    => '~/.septober.yml' , 
     :local               => false ,
+    :timeout             => 7 ,
   }
   
   def init
     $opts[:config_file] = $opts[:dflt_config_file]
-    #$colors_active = true
     $optparse = OptionParser.new do |opts|
       opts.on( '-c', '--config <FILE>', 'uses a different configfile from: '+$opts[:dflt_config_file] ) {|arg_file|  
         puts "Importing file different from default: #{yellow arg_file}"
         $opts[:config_file] = arg_file  
       }
-      opts.on( '-d', '--debug', 'enables debug (DFLT=false)' )  {  $opts[:debug] = true ; $debug = true ; debug_on('Debug enabled from ARGV')}
-      opts.on( '-h', '--help', 'Display this screen' )          {  puts(opts); exit 1 }
+      opts.on( '-d', '--debug',     'enables debug (DFLT=false)' )  {  $opts[:debug] = true ; $debug = true ; debug_on('Debug enabled from ARGV')}
+      opts.on( '-h', '--help',      'Display this screen' )          {  puts(opts); exit 1 }
       opts.on( '-n', '--no-colors', 'Deactives colors (onta e disonore!)' ) { $colors_active = false }
-      opts.on( '-l', '--local', 'uses local instead' )    {  $opts[:local] = true }
-      opts.on( '-v', '--verbose', 'Output more information' )   { $opts[:verbose] = true}
+      opts.on( '-l', '--local',     'uses local instead' )    {  $opts[:local] = true }
+      opts.on( '-t', '--timeout TIMEOUT',   "Sets timeout (default =#{$opts[:timeout]}s)" ) {|new_timeout| 
+        $opts[:timeout] = new_timeout.to_i rescue 5
+        RemoteTodo.timeout = new_timeout.to_i rescue 5
+      }
+      opts.on( '-v', '--verbose',   'Output more information' )   { $opts[:verbose] = true}
 
       opts.banner = <<-API_OPTIONS
 #{$0} v.#{$PROG_VER}
@@ -70,12 +79,19 @@ Usage: #{File.basename $0} [options] [add|list|done|del] [args]
     add <FREE TEXT>            # adds new task in free text with some magic..
     delete <ID>                # T delete ticket.ID (DONT USE IF U CAN!)
     done <ID>                  # T posts ticket.ID :done (resolved)
+    edit <ID> [ACTION1:ARG1] [ACT2:ARG2]# T posts generic action for ticket.ID /edit.xml?due=tomorrow&ACT2=ARG2
     list                       # shows a list of your todos yet to complete
     mail <ID>                  # T mail to yourself ticket.ID !!!
     show <ID>                  # shows details about todo with id=ID
     procrastinate <ID> <NDAYS> # T mail to yourself ticket.ID !!!
     sleep <ID> <NDAYS>         # T mail to yourself ticket.ID !!!
-
+    
+  Examples:
+    septober --local edit 110 due:tomorrow
+    septober list
+    septober show 1
+    septober add 'This is a ticket with priority 4 and a simple @example tag!'
+    
   Options:    
       API_OPTIONS
     end
@@ -85,10 +101,14 @@ Usage: #{File.basename $0} [options] [add|list|done|del] [args]
   
   #################################################################################################################################################
   class RemoteTodo < ActiveResource::Base
-    self.site = "http://septober.example.com/" # uninitialized
+    # With a singleton u can define the accessors of the class (attr accessor for self!)
+    #class << self
+    #  attr_accessor :description  # = '-'
+    #end
+    self.site         = "http://septober.example.com/" # uninitialized
     self.element_name = 'todo'
-    self.timeout = 5
-    #self.proxy = nil
+    self.timeout      = $opts[:timeout] rescue 6
+    
     @@sample_yml_config = <<-SAMPLE_YML_CONFIG 
 riccardo heroku:  &DEVEL_LOCAL
   # YAML file with septober configuration. For more info: http://septober.heroku.com/
@@ -136,6 +156,7 @@ SAMPLE_YML_CONFIG
         self.site = conf_hash['site']
         self.user = conf_hash['user']
         self.password = conf_hash['password']
+        self.description = conf_hash['description'] rescue '-'
         deb "Conf imported successuflly: #{blue self.user}@#{self.site}"
       else
         pred "Missing file: #{file} !!! Try to do the following:"
@@ -148,6 +169,14 @@ SAMPLE_YML_CONFIG
       self.name
     end
     
+    def self.description
+      @@description ||= '-'
+    end
+    
+    def self.description=(desc)
+      @@description = desc
+    end
+    
     def colored_project_name()
       colora(project.color || :grey ,project.name)
     end
@@ -213,8 +242,10 @@ SAMPLE_YML_CONFIG
   #############################
   # Program start..
   
+  # header
   def bannerino(desc)
-    "#septober v#{$PROG_VER} #{white desc.to_s} (#{green RemoteTodo.user} @ #{cyan RemoteTodo.site.to_s.split('/')[2] })"
+    "#septober v#{$PROG_VER} #{white desc.to_s} (#{green RemoteTodo.user} @ #{cyan RemoteTodo.site.to_s.split('/')[2] }, timeout=#{RemoteTodo.timeout})" + 
+      (RemoteTodo.description.length > 2 ? " # #{gray RemoteTodo.description}" : '')
   end
 
   def todo_list(opts={})
@@ -232,7 +263,7 @@ SAMPLE_YML_CONFIG
   to assing the correct ptoject and stuff..
 =end
   def todo_add(words_from_argv)
-    puts bannerino( "Add(#{words_from_argv})" )
+    puts bannerino( "Add('#{words_from_argv}')" )
     # TODO put this into begin/end/catch !!!
     t = RemoteTodo.create( 
       :name => words_from_argv, 
@@ -277,6 +308,7 @@ SAMPLE_YML_CONFIG
         :my_action => action, 
         :from_cli_in_test_ric => Socket.gethostname
       }.merge( opts.fetch( :additional_args, {:nis => :bah } ) ) # if there are ,m good. Otherwise, "nisba" :)
+      deb "todo_generic_put(id=#{id},#{purple action}, #{gray opts.inspect})"
       todo.put(action, put_options ) # test stuff
       #todo.put(action, :my_action => action, :from_cli_in_test_ric => Socket.gethostname , additional_args) # test stuff
     rescue ActiveResource::ResourceNotFound
@@ -308,15 +340,17 @@ SAMPLE_YML_CONFIG
     #unless ARGV.size > 0
     #  usage "Give me at least 1 argument" # Maybe default to list?!? 
     #end
-    all_args = ARGV[1..-1].join(' ')
+    all_args = ARGV[1..-1].join(' ') rescue ''
     case ARGV[0].to_s
       when 'list'  ;    todo_list()
       when 'show'  ;    todo_show(ARGV[1])
       when 'done'  ;    todo_done(ARGV[1],true)
       when 'add'   ;    todo_add(all_args) # all except last one
       when 'toggle';    todo_toggle(ARGV[1]) # all except last one
-      when 'delete';    todo_generic_put(ARGV[1], :delete , :additional_args => {:test_foo => 'test deletion string, please removeme' }) # all except last one
-      #when 'del';    copy
+      when 'delete';    todo_generic_put(ARGV[1], :delete , :additional_args => {:test_foo => 'test deletion string, with whole DELETE' }) 
+      when 'del';       todo_generic_put(ARGV[1], :delete , :additional_args => {:test_foo => 'test deletion string, with just DEL' }) 
+      when 'edit';      todo_generic_put(ARGV[1], :edit,    :additional_args => ARGV.map{|arg| k,v=arg.split(':') } )
+          # TODO transform [ [act1, arg1], [act2,arg2]] into {:act1 => arg1, :act2 => arg2 }
       when 'tag'   ;    todo_generic_put(ARGV[1], :additional_args => {:tag_with => all_args.join(',') }) # all except last one
       when 'help'  ;    usage 'Explicitly called help..'
       when ''      ;    todo_list()

data/ric.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ric}
-  s.version = "0.11.13"
+  s.version = "0.11.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Riccardo Carlesso"]
-  s.date = %q{2011-02-09}
+  s.date = %q{2011-02-10}
   s.description = %q{My first gem with various utilities (colors and tests now). 
   My name is Riccardo, hence 'ric' (ok I admit it, this was just ot prove Im able to build a sentence
    with hence!)}
   s.email = %q{['p','ll','diusbonton].join('a') @ gmail.com}
   s.executables = ["itunes", "ric", "riclib-test", "septober", "xcopy"]
   s.extra_rdoc_files = ["LICENSE", "README.md", "TODO", "bin/itunes", "bin/ric", "bin/riclib-test", "bin/septober", "bin/xcopy", "lib/rails/acts_as_carlesso.rb", "lib/rails/helpers/rails_helper.rb", "lib/ric.rb", "lib/ric/colors.rb", "lib/ric/conf.rb", "lib/ric/debug.rb", "lib/ric/files.rb", "lib/ric/html.rb", "lib/ric/zibaldone.rb", "lib/ruby_classes/arrays.rb", "lib/ruby_classes/strings.rb", "lib/tmp/uniquify.rb"]
-  s.files = ["HISTORY.yml", "LICENSE", "Manifest", "README.md", "Rakefile", "TODO", "VERSION", "bin/itunes", "bin/ric", "bin/riclib-test", "bin/septober", "bin/xcopy", "init.rb", "lib/rails/acts_as_carlesso.rb", "lib/rails/helpers/rails_helper.rb", "lib/ric.rb", "lib/ric/colors.rb", "lib/ric/conf.rb", "lib/ric/debug.rb", "lib/ric/files.rb", "lib/ric/html.rb", "lib/ric/zibaldone.rb", "lib/ruby_classes/arrays.rb", "lib/ruby_classes/strings.rb", "lib/tmp/uniquify.rb", "rails/init.rb", "sbin/reboot.rb", "sbin/ric_reboot.rb", "test/sample_conf.yml", "test/strings_helper.rb", "test/test_helper.rb", "var/www/index.html", "ric.gemspec"]
+  s.files = ["HISTORY.yml", "LICENSE", "Manifest", "README.md", "Rakefile", "TODO", "VERSION", "bin/itunes", "bin/ric", "bin/riclib-test", "bin/septober", "bin/xcopy", "init.rb", "lib/rails/acts_as_carlesso.rb", "lib/rails/helpers/rails_helper.rb", "lib/ric.rb", "lib/ric/colors.rb", "lib/ric/conf.rb", "lib/ric/debug.rb", "lib/ric/files.rb", "lib/ric/html.rb", "lib/ric/zibaldone.rb", "lib/ruby_classes/arrays.rb", "lib/ruby_classes/strings.rb", "lib/tmp/uniquify.rb", "rails/init.rb", "ric.gemspec", "sbin/reboot.rb", "sbin/ric_reboot.rb", "test/sample_conf.yml", "test/strings_helper.rb", "test/test_helper.rb", "var/www/index.html"]
   s.homepage = %q{http://github.com/palladius/riclib}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ric", "--main", "README.md"]
   s.require_paths = ["lib"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ric
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: 
   segments: 
   - 0
   - 11
-  - 13
-  version: 0.11.13
+  - 14
+  version: 0.11.14
 platform: ruby
 authors: 
 - Riccardo Carlesso
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +00:00
+date: 2011-02-10 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -80,13 +80,13 @@ files:
 - lib/ruby_classes/strings.rb
 - lib/tmp/uniquify.rb
 - rails/init.rb
+- ric.gemspec
 - sbin/reboot.rb
 - sbin/ric_reboot.rb
 - test/sample_conf.yml
 - test/strings_helper.rb
 - test/test_helper.rb
 - var/www/index.html
-- ric.gemspec
 has_rdoc: true
 homepage: http://github.com/palladius/riclib
 licenses: []