ztrening 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.0.3 2010-06-30
+
+* fixed open
+* fixed find(), open()
+* find_by_id, find_by_name
+
 === 0.0.2 2010-06-30
 
 * resque file opening

data/Manifest.txt

@@ -3,7 +3,6 @@ Manifest.txt
 README.rdoc
 Rakefile
 bin/zt
-lib/zt/cli.rb
 lib/ztrening.rb
 script/console
 script/destroy

data/bin/zt

@@ -1,20 +1,17 @@
 #!/usr/bin/env ruby
 #
-#  Created on 2010-6-30.
 #  Copyright (c) 2010. All rights reserved.
 
 require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/ztrening")
-# require "zt/cli"
-
-# Zt::CLI.execute(STDOUT, ARGV)
 
 include ZtreningM
 
 USAGE = <<EOS
 usage: zt.rb [refresh, list, find, open]
         find [string]
-        open [filename] => file mora imati '// zt [ime zadatka]' na 1. liniji
+        open [filename]  => file mora imati '// zt [ime zadatka]' na 1. liniji
+        -h, --help
 EOS
 
 @imefromfile_regex = /\/\/ zt (.*)/
@@ -27,11 +24,12 @@ end
 
 
 if ARGV[0] == 'refresh'
-  z = Ztrening.new(:web)
+  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]
     file = File.new(ARGV[1], 'r')
   else
@@ -44,14 +42,61 @@ elsif ARGV[0] == 'open' && ARGV[1]
     puts "Prva linija ne sadrzi ime zadatka"
     exit
   else
-    z.lista
-    ime = (prvalin.sub! /\/\/ (zt )?/, '').to_s
-    puts "Ime zadatka iz datoteke: #{ime}"
-    z.find ime
-    puts "z.lista: "
-    z.lista
-    z.find_by_id z.lista[0][0]
-    z.open
+    str = prvalin.sub(/\/\/ /, '').sub(/\n/, '')
+    byid=0
+    regex_wime = /^zt /
+    regex_wid  = /^ZT /
+
+    if str.match(regex_wime)
+      str.sub!(regex_wime, '')
+      ime = str
+      z.find_by_name(ime)
+    elsif str.match(regex_wid)
+      str.sub!(regex_wid, '')
+      id = str
+      byid=1
+      z.find_by_id(id.to_a)
+    end
+
+    if !str.match(/^./)
+      puts "Datoteka ne sadrzi (ispravno) ime ili ID!"
+      exit
+    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}"
+    end
+
+    hh = if ime.nil?; "ID" else "ime" end
+    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]
@@ -70,4 +115,7 @@ elsif ARGV[0] == 'find'
 elsif ARGV[0] == 'list'
   z = Ztrening.new
   z.lista_txt
+else
+  puts USAGE
+  exit
 end

data/lib/ztrening.rb

@@ -6,7 +6,7 @@ class Array
 end
 
 module ZtreningM
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   class Ztrening
     def initialize(*opts)
@@ -36,25 +36,38 @@ module ZtreningM
     end
 
     def find(str)
-      puts "Lista je prazna!" if @lista.nil? || @lista.empty?
-      ll ||= []
-      @lista.each do |e|
-        if e[1] =~ /#{str}/
-          ll << e
-        end
-      end
-      @lista = []
+      puts "Lista je prazna!" if @lista.nil? or @lista.empty?
+      ll=[]
+      @lista.each { |e|
+        ll << e if e[1].match(/#{str}/)
+      }
       @lista = ll
     end
 
+    def find_by_name(str)
+      puts "Lista je prazna! (find_uniq)" if @lista.nil? or @lista.empty?
+      ll=[]
+      @lista.each { |e| ll << e if e[1] == str }
+      @lista = ll
+      puts "find_by_name lista cnt: #{@lista.count}"
+    end
+
     def find_by_id(id)
-      @lista.detect { |e| id == e[0] }
+      puts "Lista je prazna! (find_by_id)" if @lista.nil? or @lista.empty?
+      # puts "find_by_id lista cnt begin: #{@lista.count}"
+      ll=[]
+      @lista.each { |e| ll << e if e[0].match /#{id}/ }
+      @lista = ll
+      # puts "find_by_id lista cnt return: #{@lista.count}"
     end
 
-    def open
-      puts "Lista je prazna!" if @lista.nil? || @lista.empty?
+    def open(arg=-1)
+      puts "Lista je prazna! (open)" if @lista.nil? || @lista.empty?
       if @lista.count == 1
         system "open #{link @lista[0][0]}"
+      elsif arg!=-1
+        # puts "arg u open(): #{arg}, #{arg.class}"
+        system "open #{link(@lista[arg][0])}"
       else
         puts "Lista ne sadrzi 1 zadatak!"
       end
@@ -64,6 +77,10 @@ module ZtreningM
       @lista
     end
 
+    # def lista=(l)
+    #   @lista=l
+    # end
+
     def lista_txt
       puts 'Zadatci:'
       @lista.each { |l| puts "Zadatak: #{l[1]}" }
@@ -105,10 +122,6 @@ module ZtreningM
     end
 
     def cmd
-#       return <<EOS
-#       cat #{@list_fname} | grep '&nbsp;<a href="tasks.php?show_task=.*>' | sed 's/.*&nbsp;//g' | \
-#         grep -o '[0-9]\\{10\\}.*' | sed -e 's/">/ - /g' -e 's:</a></TD>::g'
-# EOS
       return <<EOS
       cat #{@list_fname} | grep '&nbsp;<a href="tasks.php?show_task=.*>' | sed 's/.*&nbsp;//g' | \
         grep -o '[0-9]\\{10\\}.*' | sed -e 's/">/ - /g' -e 's:</a></TD>::g'
@@ -116,4 +129,4 @@ EOS
     end
 
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ztrening
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - BKrsta
@@ -66,7 +66,6 @@ files:
 - README.rdoc
 - Rakefile
 - bin/zt
-- lib/zt/cli.rb
 - lib/ztrening.rb
 - script/console
 - script/destroy

data/lib/zt/cli.rb

@@ -1,42 +0,0 @@
-require 'optparse'
-
-module Zt
-  class CLI
-    def self.execute(stdout, arguments=[])
-
-      # NOTE: the option -p/--path= is given as an example, and should be replaced in your application.
-
-      options = {
-        :path     => '~'
-      }
-      mandatory_options = %w(  )
-
-      parser = OptionParser.new do |opts|
-        opts.banner = <<-BANNER.gsub(/^          /,'')
-          This application is wonderful because...
-
-          Usage: #{File.basename($0)} [options]
-
-          Options are:
-        BANNER
-        opts.separator ""
-        opts.on("-p", "--path PATH", String,
-                "This is a sample message.",
-                "For multiple lines, add more strings.",
-                "Default: ~") { |arg| options[:path] = arg }
-        opts.on("-h", "--help",
-                "Show this help message.") { stdout.puts opts; exit }
-        opts.parse!(arguments)
-
-        if mandatory_options && mandatory_options.find { |option| options[option.to_sym].nil? }
-          stdout.puts opts; exit
-        end
-      end
-
-      path = options[:path]
-
-      # do stuff
-      stdout.puts "To update this executable, look in lib/zt/cli.rb"
-    end
-  end
-end