ztrening 0.0.3 → 0.0.4.1

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.4.1 2010-08-05
+* specs
+* download with net/http
+* minor fixes
+
 === 0.0.3 2010-06-30
 
 * fixed open

data/bin/zt

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 #
-#  Copyright (c) 2010. All rights reserved.
+
+# TODO: prebaciti ovo lib, nova klasa - eval 'CLI.exec ARGV'
 
 require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/ztrening")
@@ -11,6 +12,7 @@ USAGE = <<EOS
 usage: zt.rb [refresh, list, find, open]
         find [string]
         open [filename]  => file mora imati '// zt [ime zadatka]' na 1. liniji
+        todo [add, del[ete]/rem[ove]]
         -h, --help
 EOS
 
@@ -23,11 +25,12 @@ if !ARGV[0] || ARGV[0]=='-h' || ARGV[0]=='--help'
 end
 
 
-if ARGV[0] == 'refresh'
+if ARGV[0] == '-v' || ARGV[0] == '--version'
+  puts "Version: #{ZtreningM::VERSION}"
+elsif %w(refresh download).include? ARGV[0]
   z = Ztrening.new :web
   puts 'New list downloaded'
 elsif ARGV[0] == 'open' && ARGV[1]
-  # TODO: maknuti gore const file regex
   z = Ztrening.new
 
   if File.exists? ARGV[1]
@@ -64,45 +67,22 @@ elsif ARGV[0] == 'open' && ARGV[1]
     end
 
     if z.lista.nil? or z.lista.empty?
-      hh = if ime.nil?; "im ID-om" else "im imenom" end
-      puts "Nema zadataka s takv#{hh}"
+      hh = ime.nil? ? "ID-om" : "imenom"
+      puts "Nema zadataka s takvim #{hh}!"
     end
 
-    hh = if ime.nil?; "ID" else "ime" end
+    hh = ime.nil? ? "ID" : "ime"
     puts "Oznaka zadatka iz datoteke: #{str} (#{hh})"
 
     puts "cnt: #{z.lista.count}"
-    # if z.lista.count > 1
-    #   puts "Postoji vise zadataka koji sadrze '#{ime}';"
-    #   puts "Odaberi jedan:"
-    #   limit, ok = 10, 1
-    #   if z.lista.count > limit
-    #     puts "Broj nadjenih zadataka prelazi limit (#{limit}) !"
-    #     exit
-    #   end
-    #   z.lista.each_with_index { |l,idx| printf "%4s: %s\n", idx+1, l[1] }
-    #   while ok > 0
-    #     print " > "; STDOUT.flush
-    #     id = STDIN.gets.chomp.to_i
-    #     if id.nil? or id == '' or !id.is_a?(Integer)
-    #       puts " ?? err 1"
-    #     end
-    #     # id -= 1
-    #     if !(1..(z.lista.count)).include?(id)
-    #       puts "izvan rangea!"; ok=1
-    #     else ok=0 end
-    #   end
-    #   puts "Otvaram zadatak: #{z.lista[id.to_i-1][1]}"
-    #   z.open id-1
-    # else
-    # z.open :name => ime | :id => id
+
     z.open id
   end
 elsif ARGV[0] == 'find'
-  if ARGV[1]
+  if ARGV[1..ARGC-1]
     z = Ztrening.new
     #z.find ARGV[1..32].join ' '
-    if ARGV[1].grep '.'
+    if ARGV[1][/.+/]
       z.find ARGV[1]
       z.lista_txt
     else
@@ -115,6 +95,30 @@ elsif ARGV[0] == 'find'
 elsif ARGV[0] == 'list'
   z = Ztrening.new
   z.lista_txt
+# elsif ARGV[0] == 'todo'
+#   if %w[show list ls].include? ARGV[1]
+#   elsif %w[add].include? ARGV[1]
+#   elsif %w[del rem delete remove].include? ARGV[1]
+#   end
+# TODO: zt set ZADATAK STATUS
+# elsif ARGV[0] == 'set'
+#   if ARGV[1]
+#     z = Ztrening.new
+#     # set ID/NAME  STATUS
+#     z.set ARGV[1], ARGV[2]
+#   else
+#     puts USAGE
+#     exit
+#   end
+elsif ARGV[0] == 'init'
+  (puts USAGE; exit) if !ARGV[1].nil? # TODO: manual dir as arg1
+  z = Ztrening.new
+  if !z.in_zaddir?
+    z.create_zaddir `pwd`.chop
+  else
+    puts "Vec postoji zaddir conf file u ovom dir-u"
+    exit
+  end
 else
   puts USAGE
   exit

data/lib/ztrening.rb

@@ -1,18 +1,22 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+require 'net/http'
 
 class Array
 	def moj_keys() Hash[*self.collect { |v| [v, true] }.flatten] end
 end
 
 module ZtreningM
-  VERSION = '0.0.3'
+  VERSION = '0.0.4.1'
 
   class Ztrening
     def initialize(*opts)
-      @list_fname = 'lista.txt'
-      @cmd_dwl   = "wget -q http://z-trening.com/training.php\?all_tasks\=1 -O #{@list_fname}"
-      @link_base = 'http://z-trening.com/tasks.php?show_task=_ID_'
+      @list_fname  = 'ztlista.txt'
+      # @cmd_dwl     = "wget -q http://z-trening.com/training.php\?all_tasks\=1 -O #{@list_fname}"
+      @dwl_link    = "z-trening.com|/training.php\?all_tasks\=1"
+      @link_base   = 'http://z-trening.com/tasks.php?show_task=_ID_'
+      @ztdir_fname = '.ztconf' # bolje ztdata; file sa conf vars
+      @todo_fname  = '_PROJDIR_/todo.txt'
 
       @lista ||= []
       @opts = opts.moj_keys
@@ -22,7 +26,7 @@ module ZtreningM
       if !@opts[:web].nil?
         web
         execout = exec
-        (puts execerrmsg; exit) if execout.nil? || execout.empty?
+        (puts execerrmsg; exit) if (execout.nil? || execout.empty?)
         @lista = parse(execout)
       else
         if !File.exists? @list_fname
@@ -33,6 +37,7 @@ module ZtreningM
         (puts execerrmsg; exit) if execout.nil? || execout.empty?
         @lista = parse(execout)
       end
+      @lista.sort!
     end
 
     def find(str)
@@ -49,7 +54,7 @@ module ZtreningM
       ll=[]
       @lista.each { |e| ll << e if e[1] == str }
       @lista = ll
-      puts "find_by_name lista cnt: #{@lista.count}"
+      # puts "find_by_name lista cnt: #{@lista.count}"
     end
 
     def find_by_id(id)
@@ -77,10 +82,6 @@ module ZtreningM
       @lista
     end
 
-    # def lista=(l)
-    #   @lista=l
-    # end
-
     def lista_txt
       puts 'Zadatci:'
       @lista.each { |l| puts "Zadatak: #{l[1]}" }
@@ -99,6 +100,53 @@ module ZtreningM
       puts '</ul>' if opts[:li]
     end
 
+
+    # get_zaddir
+    def findzaddir
+      # nadji DirName s datotekom '.ztprojdir', prema gore
+      # false ako nema
+
+      for n in (0..32)
+        p = ('../'*n)
+        return File.expand_path(p) if File.file?("#{p}#{@ztdir_fname}")
+        return false if File.expand_path p == "/"
+      end
+
+    end
+
+    def create_zaddir(dir) #(args) - koristi hash i symbole
+      # TODO: args: string dirname='', bool templates, ...
+      if File.directory? dir
+        File.open("#{File.dirname dir}/@ztdir_fname", "w"){ |f|
+          f.write(<<EOS)
+todo_file = todo.txt
+status_file = status.txt
+EOS
+        }
+        FileUtils.touch "#{File.dirname dir}/todo.txt"
+        FileUtils.touch "#{File.dirname dir}/status.txt"
+        puts "Napravljen ztdir u dir-u #{dir}"
+      else
+        puts "Dir #{dir} ne postoji, ne mogu napraviti zaddir!"
+        return false
+      end
+    end
+
+    def in_zaddir?
+      (@ztdir_fname && File.exists?("./#{@ztdir_fname}")) || false
+    end
+
+    def set(arg)
+      if arg.start_with? '500000'
+        id = arg
+      else
+        find_by_name arg
+        id = @lista[0][0]
+      end
+      # TODO: set()
+    end
+
+
     private
 
     def link(id)
@@ -106,6 +154,7 @@ module ZtreningM
     end
 
     def exec
+      # FIXME: open(@list_fname).read > stdin od thread-a
       t = Thread.new { `#{cmd}` }
       return t.value.split "\r\n"  
     end
@@ -118,7 +167,14 @@ module ZtreningM
 
     def web
       puts 'Downloading list ...'
-      %x[#{@cmd_dwl}]
+      # %x[#{@cmd_dwl}]
+      link = @dwl_link.split '|'
+      Net::HTTP.start(link[0]) { |http|
+        resp = http.get(link[1])
+        File.open(@list_fname, "wb") { |file|
+          file.write(resp.body)
+        }
+      }
     end
 
     def cmd

data/test/test_ztrening.rb

@@ -8,4 +8,7 @@ class TestZtrening < Test::Unit::TestCase
   def test_truth
     assert true
   end
+
+
+
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ztrening
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 93
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  - 1
+  version: 0.0.4.1
 platform: ruby
 authors: 
 - BKrsta
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 +02:00
+date: 2010-08-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency