ric 0.11.12 → 0.11.13

data/HISTORY.yml

@@ -1,4 +1,9 @@
 # would like to have this in YML format :)
+2011-02-06 v0.11.13:
+ - septober v0.9.7 with better CLI
+ - reengineering septober yaml and help...
+2011-02-06 v0.11.12:
+ - septober v0.9.6 with tags and other stuff
 2011-02-06 v0.11.12:
  - septober v0.9.6 with tags and other stuff
 2011-02-06 v0.11.11:

data/Manifest

@@ -24,7 +24,6 @@ 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.12
+0.11.13

data/bin/septober

@@ -2,24 +2,24 @@
 
 =begin
   ############################################################
-	# $Id: script.rb 5582 2011-01-18 15:18:36Z rcarlesso $
-  ##########################################################
   @author:    Riccardo Carlesso
-  @email:     riccardo.carlesso@heanet.ie
+  @email:     riccardo.carlesso@gmail.com
+  @url:       http://github.com/palladius/septober
+  @script:    septober
   @maturity:  development
   @language:  Ruby
-  @synopsis:  Brief Description here
 	@tags:      development, rcarlesso
+  @synopsis:  This connects to septober websites. For more info, look here
   @description:
    septober.heroku.com client to add and list todos!
    
    TODO
-   - add --conf|-c    : to change configuration file
    - add --context|-x : to change context (--local => --context 'local' , default: "septober" )
    
    API: add actions (done, toggle, ..., due <today|tomorrow|monday> )
    
   @history:
+    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'
     0.9.4 2011-02-04 added 'done' action (and 'delete' ?)    
@@ -28,7 +28,7 @@
     0.9.1 2011-01-18 First version
  ############################################################
 =end
-  $PROG_VER = '0.9.6'
+  $PROG_VER = '0.9.7'
 
   require 'optparse'       
   require 'rubygems'
@@ -36,23 +36,29 @@
   require 'active_resource'
   require 'socket'
   
+  include RubyClasses::Array 
+  
   $DEBUG    = false
   
   $opts = {
     :app_name            => 'septober client',
     :hello               => 'Welcome to this terrific application',
     :septober_url        => 'http://septober.heroku.com/' , 
-    :dflt_config_file         => '~/.septober.yml' , 
+    :dflt_config_file    => '~/.septober.yml' , 
     :local               => false ,
   }
   
   def init
-    #$opts = {}
-    optparse = OptionParser.new do |opts|
-      opts.on( '-c', '--config <FILE>', 'uses a different configfile from: '+$opts[:dflt_config_file] ) {|arg_file|  $opts[:config_file] = arg_file  }
+    $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( '-j', '--jabba', 'Activates my Jabber powerful CLI' ) {  $opts[:jabba] = true  }
+      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}
 
@@ -73,7 +79,7 @@ Usage: #{File.basename $0} [options] [add|list|done|del] [args]
   Options:    
       API_OPTIONS
     end
-    optparse.parse! 
+    $optparse.parse! 
     RemoteTodo.import_config()
   end
   
@@ -83,24 +89,50 @@ Usage: #{File.basename $0} [options] [add|list|done|del] [args]
     self.element_name = 'todo'
     self.timeout = 5
     #self.proxy = nil
-    @@sample_yml_config = 'septober: 
-       # YAML file with septober configuration. For more info: http://septober.heroku.com/
-       site: "http://localhost:3000/api/"   # or http://septober.heroku.com/api/
-       user: guest
-       password: guest'
+    @@sample_yml_config = <<-SAMPLE_YML_CONFIG 
+riccardo heroku:  &DEVEL_LOCAL
+  # YAML file with septober configuration. For more info: http://septober.heroku.com/
+  site: "http://localhost:3000/api/"   # or http://septober.heroku.com/api/
+  user: guest
+  password: guest
+  description: My Rails 3 development (guest//guest shuld work for real This is NOT a random thing)
+RiccardoHeroku: &RICCARDO_HEROKU
+  site: "http://septober.heroku.com/api/"   # or http://septober.heroku.com/api/
+  user: YOURUSERNAME
+  password: YOURPASSWORD
+  description: this server exists but is REALLY slow..
+Your server:
+  site: http://your_server.example.com/api/
+  user: USERNAME
+  pass: V3ry_D1ff1cul1
+  description: you can use your own server. this is open source. Just remember to say Riccardo you think hes a genius. I dont want money, just fame.
+#########################################################################################################
+
+  #########################################################################################################
+  # YAML file with septober configuration. For more info: http://septober.heroku.com/
+  # You just change here:
+septober:
+  <<: *RICCARDO_HEROKU
+septober_local:
+  <<: *DEVEL_LOCAL       
+      
+SAMPLE_YML_CONFIG
+      
     # self.ssl_options = {:cert         => OpenSSL::X509::Certificate.new(File.open(pem_file))
     #                        :key          => OpenSSL::PKey::RSA.new(File.open(pem_file)),
     #                        :ca_path      => "/path/to/OpenSSL/formatted/CA_Certs",
     #                        :verify_mode  => OpenSSL::SSL::VERIFY_PEER}
     
     def self.import_config(file=nil)
-      file ||= $opts[:dflt_config_file]
+      file ||= $opts[:config_file]
       real_file = File.expand_path file
       deb "Importing config from #{file}.."
       if File.exists?(real_file)
         #puts "TODO import from #{file} (local=#{$opts[:local]})"
-        sub_conf = $opts[:local] ? 'septober_local' : 'septober'
-        conf_hash = YAML.load_file(real_file)[sub_conf] rescue nil
+        sub_conf = $opts[:local] ? 'septober_local' : 'septober' # TODO remove local... put a generic subconf key, like 'wor', devel', ...
+        whole_hash = YAML.load_file(real_file) rescue {}
+        puts "Possible sub_confs: #{yellow whole_hash.keys.join(', ')}"
+        conf_hash = whole_hash[sub_conf] rescue nil
         self.site = conf_hash['site']
         self.user = conf_hash['user']
         self.password = conf_hash['password']
@@ -146,26 +178,33 @@ Usage: #{File.basename $0} [options] [add|list|done|del] [args]
     def show_entry(opts={})
       mywhere = where ? azure( " @#{where}") : ''
       mytags = (tag_list != [] ? 
-        ' '+tag_list.map{|tag| purple("@#{tag}")}.join(' ') : 
+        ' '+tag_list.map{|tag| orange("@#{tag}")}.join(' ') : 
         '' 
       ) rescue ''
       return sprintf "%-3d %-30s %2s %s %s%s",
         id, colored_project_name , priority_str(priority), colored_due_explaination(due), name, mywhere+mytags
     end
     
+    def tags_comma_separated_list
+      orange(tag_list.join(', '))
+    end
+    
+    def colored_name()
+      white(name)
+    end
+    
     def show_full_entry(opts={})
       attributes = %w{
-        name id 
+        colored_name id 
         due hide_until   
         active depends_on_id 
         photo_url progress_status 
-        source tag_list 
+        source tags_comma_separated_list 
         url where
       }
       key_vals = attributes.map{|attr| [attr,send(attr)] } # array of [key, val]
-      key_vals << ['ProjectName', "#{project.name} (#{project.color.to_s.send( project.color ) rescue project.color})" ]
-      #key_vals << ['PjColor', project.color ]
-      key_vals.map{|k,v| [k,v] }.sort{|x,y| x.first <=> y.first }.map{ |k,v| "#{k}: #{v}" }.join("\n") +
+      key_vals << ['ProjectName', "#{project.name} (#{send(project.color,project.color ) rescue white(project.color) })" ]
+      key_vals.map{|k,v| [k,v] }.select{|k,v| v.to_s != ''}.sort{|x,y| x.first <=> y.first }.map{ |k,v| "#{k}: #{v}" }.join("\n") +
         "\n--\n#{description}"
     end
   end # /RemoteTodo
@@ -175,7 +214,7 @@ Usage: #{File.basename $0} [options] [add|list|done|del] [args]
   # Program start..
   
   def bannerino(desc)
-    "#Todo #{white desc.to_s} (user: #{blue 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] })"
   end
 
   def todo_list(opts={})
@@ -184,7 +223,7 @@ Usage: #{File.basename $0} [options] [add|list|done|del] [args]
     all = RemoteTodo.find(:all)
     all.each{|todo|
       puts( todo.show_entry ) unless( show_only_active && ! todo.active )
-      deb "Full ToString for #{white todo}:\n\t#{todo.inspect}"
+      #deb "Full ToString for #{white todo}:\n\t#{todo.inspect}"
     } if all
   end
   
@@ -234,7 +273,12 @@ Usage: #{File.basename $0} [options] [add|list|done|del] [args]
     begin
       todo = RemoteTodo.find(id)
       puts "Todo.#{id} ok #{green action}: #{yellow( todo.to_s )}"
-      todo.put(action, :my_action => action, :from_cli_in_test_ric => Socket.gethostname ) # test stuff
+      put_options = {
+        :my_action => action, 
+        :from_cli_in_test_ric => Socket.gethostname
+      }.merge( opts.fetch( :additional_args, {:nis => :bah } ) ) # if there are ,m good. Otherwise, "nisba" :)
+      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
       puts "Sorry ResourceNotFound: #{red $!}" 
       exit 11
@@ -251,6 +295,12 @@ Usage: #{File.basename $0} [options] [add|list|done|del] [args]
     pred "To Be implemented Yet"
   end
   
+  def usage(explaination=nil)
+    puts $optparse
+    pred(explaination) if explaination
+    exit 85
+  end
+  
 
   def main()
     init()
@@ -258,12 +308,20 @@ Usage: #{File.basename $0} [options] [add|list|done|del] [args]
     #unless ARGV.size > 0
     #  usage "Give me at least 1 argument" # Maybe default to list?!? 
     #end
-    case ARGV[0]
-      when 'list' ;    todo_list()
-      when 'show' ;    todo_show(ARGV[1])
-      when 'done' ;    todo_done(ARGV[1],true)
-      when 'add'  ;    todo_add(ARGV[1..-1].join(' ')) # all except last one
-      #else ;           usage "Unrecognized command: #{ARGV[0]}"
+    all_args = ARGV[1..-1].join(' ')
+    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 '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()
+      else            
+        usage "Unrecognized command: '#{ARGV[0]}'"
     end
   end
 

data/ric.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ric}
-  s.version = "0.11.12"
+  s.version = "0.11.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Riccardo Carlesso"]
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   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", "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.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.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: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 11
-  - 12
-  version: 0.11.12
+  - 13
+  version: 0.11.13
 platform: ruby
 authors: 
 - Riccardo Carlesso
@@ -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: []