my-lib 0.0.2.0 → 0.2.1

data/Gemfile.lock

@@ -14,10 +14,10 @@ GEM
       git (>= 1.2.5)
       rake
     mechanize (2.0.1)
-      net-http-digest_auth (>= 1.1.1, ~> 1.1)
+      net-http-digest_auth (~> 1.1, >= 1.1.1)
       net-http-persistent (~> 1.8)
       nokogiri (~> 1.4)
-      webrobots (>= 0.0.9, ~> 0.0)
+      webrobots (~> 0.0, >= 0.0.9)
     net-http-digest_auth (1.1.1)
     net-http-persistent (1.8.1)
     nokogiri (1.5.0)

data/VERSION

@@ -1 +1 @@
-0.0.2.0
+0.2.1

data/lib/lib/job.rb

@@ -23,15 +23,17 @@ class MyJobAnisoku
     require 'mechanize'
     require 'net/http'
     @a = args
+    @debug = args[:debug] ||= false
     @a[:url] ||= 'http://youtubeanisoku1.blog106.fc2.com/'
     @a[:url] = URI.parse @a[:url] unless @a[:url].class == URI::HTTP
     @agent = Mechanize.new
     @a[:status] ||= :new
     @a[:recent] ||= 7
-    @a[:limit] ||= 3
+    @a[:limit] ||= 4
     # make md5 with magicword '_gGddgPfeaf_gzyr'
     @FC2magick = @a[:fc2magick] ||='_gGddgPfeaf_gzyr'  #updated FC2 2011.7
     raise "job have no machine error"  unless @a[:machine]
+    p @a if @debug && @a[:status] == :new
   end
 
   # check kousin page
@@ -39,20 +41,42 @@ class MyJobAnisoku
     print "Tokkakari".yellow
     @agent.get @a[:url]
     links_kousins = @agent.page.links_with(:text => /#{"更新状況"}/)
+    links_kousins2 = @agent.page.links_with(:href => /blog\-entry/)
     targs = []
+    targs2 = []
+
     links_kousins.each do |link|
       targs << link.uri
     end
+    
+    links_kousins2.each do |link|
+      targs2 << link.uri
+    end
+
     targs.each_with_index do |link,i|
       break if i >= @a[:recent]
-      job = MyJobAnisoku.new(
-                             @a.merge({
-                                        :url => link,
-                                        :status => :second
-                                      }) )
+      p link if @debug
+      job = MyJobAnisoku
+        .new(
+             @a.merge({
+                        :url => link,
+                        :status => :second,
+                      }) )
       @a[:machine].retry job
     end
     
+    targs2.each_with_index do |link,i|
+      p link if @debug
+      job = MyJobAnisoku
+        .new(
+             @a.merge({
+                        :url => link,
+                        :status => :kobetu,
+                      }) )
+      @a[:machine].retry job
+    end
+
+    
   end
 
   # check shoukai page
@@ -68,6 +92,7 @@ class MyJobAnisoku
 
     # make job for each links_kobetu
     links_kobetu.each do |link|
+      p link if @debug
       job = MyJobAnisoku.new(
                              @a.merge({
                                         :url => link,
@@ -95,6 +120,7 @@ class MyJobAnisoku
         #        puts "NOW 2 PROCEED FETCH".green.bold + html[0..20].yellow.bold
         indi = Nokogiri::HTML.fragment(html).css("a")
         indi.each do |va|
+          p va[:href] if @debug
           if va[:href] =~ /(http:\/\/say-move\.org\/comeplay\.php.*)/
             job = MyJobAnisoku.new(
                                    @a.merge({
@@ -105,7 +131,7 @@ class MyJobAnisoku
           end
         end
       else
-        #        puts "CANCELL FETCH".cyan.bold + html[0..20].yellow.bold
+        puts "ALREADY REGISTED CANCELL FETCH".cyan.bold + html[0..20].yellow.bold if @debug
       end
       key = nil
     end
@@ -127,6 +153,7 @@ class MyJobAnisoku
       set =  @agent.page/"/html/body/div/div[2]/div[3]/object/param[5]/@value"
       fc2 = set[0].value.split('&')[1].split('=')[1]
       unless fc2.nil?
+        p sm[:url] if @debug
         job = MyJobAnisoku.new(
                                @a.merge({
                                           :url => sm[:url],
@@ -188,8 +215,8 @@ class MyJobAnisoku
     command = "curl -# -L -R -o '#{filename}' '#{uri}' >/dev/null 2>&1"
     #    command += "&& growlnotify -t '#{filename}' -m '#{uri}' "
 
-    #    puts command
-    system command
+    puts command if @debug
+    system command unless @debug
   end
 
   # run in thread

data/lib/lib/machine.rb

@@ -6,9 +6,11 @@
 # this class has queue of jobs.controll jobs and run jobs
 module MyMachine
 
-  def initialize
+  def initialize(args={})
     require 'thread'
+    require 'pp'
     @queue = Queue.new
+    @debug = args[:debug]||= false
   end
   
   def setup
@@ -40,7 +42,7 @@ class MyEventMachineDojin
   include MyMachine
 
   def initialize(args={ })
-    super()
+    super(args)
     @args = args
     @args[:start] ||= 3000
     @args[:stop] ||= 3100
@@ -70,23 +72,20 @@ class MyEventMachineDojin
         end
       end
     end
-#    p @endbooks.uniq!.sort
+    p @endbooks.uniq!.sort if @debug
     puts "End of fetch".green.bold
   end
 
   def connection_exceed?
-#    @args[:concurrency] <= @connection_count 
     @args[:concurrency] <= @connection_que.size
   end
 
   def connection_count!
-#    @connection_count += 1
     @connection_que.push(:t)
   end
 
   def connection_end!
     @connection_que.pop
-#    @connection_count -= 1
   end
   
   def savecontent(path)
@@ -112,7 +111,7 @@ class MyEventMachineDojin
           :book => b,
           :page => p,
           :machine => self,
-          :debug  => @args[:debug] ||= false
+          :debug  => @debug,
           )
         @queue.push job
       end
@@ -149,7 +148,7 @@ class MyMachineAnisoku
   # @option args [String] :savedir save dir
   #                        default "#{ENV['HOME']}/Desktop/video"
   def initialize(args={ })
-    super()
+    super(args)
     args[:savedir] ||= "#{ENV['HOME']}/Desktop/video"
     @savedir = args[:savedir]
     begin
@@ -164,7 +163,11 @@ class MyMachineAnisoku
     @checklist = {}
     @filelist = {}
     @dellist = []
-#    require 'pp'
+
+    @args = args
+    @args[:limit] ||= 7
+    @args[:recent] ||= 7
+    
     make_filelist
     make_dellist
   end
@@ -176,12 +179,14 @@ class MyMachineAnisoku
         if header
           filesize = File.size("#{@savedir}/#{entry}")
           @filelist[header] = [] unless chk_header(header)
-          @filelist[header] << {:size => filesize,
-                                :name => "#{@savedir}/#{entry}" }
+          @filelist[header] << {
+            :size => filesize,
+            :name => "#{@savedir}/#{entry}",
+          }
         end
       end
     end
-#    pp @filelist
+    pp @filelist if @debug
   end
   
   def chk_header(string) 
@@ -192,34 +197,34 @@ class MyMachineAnisoku
     if string.scan(/^.*?\d{1,3}話/).first
       header = string.scan(/^.*?\d{1,3}話/).first.gsub(' ','').gsub('　','')
     end
-#    p header
+    p header if @debug
     return header
   end
 
   def make_dellist
     @filelist.each do |k,v|
-#      p k
+      p k if @debug
       max_size = v.map { |e| e[:size] }.max
-#      p max_size
+      p max_size if @debug
       v.each do |vv|
         if vv[:size] < max_size || vv[:size] < 1024 * 1024 * 2
           @dellist << vv[:name]
         end
       end
     end
-#    pp @dellist
+    pp @dellist if @debug
   end
 
   def del_small_files
     @dellist.each do |e|
-#      p e
+      p e if @debug
       File.delete("#{e}")
     end
   end
 
   def episode_exists?(key)
     if @checklist[key].nil?
-#      puts "MACHINE NOE FIRST CHECK THIS EPISODE!!".red.bold
+      puts "MACHINE NOE FIRST CHECK THIS EPISODE!!".red.bold if @debug
       @checklist[key] = "checked"
       return false
     else
@@ -255,16 +260,20 @@ class MyMachineAnisoku
 
   # setup jobs
   def setupjobs
-    ajob = MyJobAnisoku.new(
-      :machine => self
-      )
+    ajob = MyJobAnisoku
+      .new(
+           :machine => self,
+           :limit => @args[:limit],
+           :recent => @args[:recent],
+           :debug => @debug,
+           )
     @queue.push ajob
   end
 
   # should stop machine or not
   def should_stop_machine?
     @gaman += 1 if @queue.empty?
-    print @gaman
-    return @queue.empty? && @gaman > 1500
+    print @gaman if @debug
+    return @queue.empty? && @gaman > 4000
   end
 end

data/my-lib.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{my-lib}
-  s.version = "0.0.2.0"
+  s.name = "my-lib"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{modeverv}]
-  s.date = %q{2011-09-21}
-  s.description = %q{longer description of your gem}
-  s.email = %q{modeverv@gmail.com}
+  s.authors = ["modeverv"]
+  s.date = "2011-10-15"
+  s.description = "longer description of your gem"
+  s.email = "modeverv@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -42,11 +42,11 @@ Gem::Specification.new do |s|
     "spec/my-lib_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/modeverv/my-lib}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{one-line summary of your gem}
+  s.homepage = "http://github.com/modeverv/my-lib"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "one-line summary of your gem"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my-lib
 version: !ruby/object:Gem::Version
-  version: 0.0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-21 00:00:00.000000000Z
+date: 2011-10-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2152468500 !ruby/object:Gem::Requirement
+  requirement: &2153883760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152468500
+  version_requirements: *2153883760
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2152467580 !ruby/object:Gem::Requirement
+  requirement: &2153883200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152467580
+  version_requirements: *2153883200
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &2152466700 !ruby/object:Gem::Requirement
+  requirement: &2153882620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152466700
+  version_requirements: *2153882620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152466000 !ruby/object:Gem::Requirement
+  requirement: &2153882120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2152466000
+  version_requirements: *2153882120
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152465080 !ruby/object:Gem::Requirement
+  requirement: &2153881500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -65,10 +65,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152465080
+  version_requirements: *2153881500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152464000 !ruby/object:Gem::Requirement
+  requirement: &2153880820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152464000
+  version_requirements: *2153880820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152462900 !ruby/object:Gem::Requirement
+  requirement: &2153880140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152462900
+  version_requirements: *2153880140
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152461700 !ruby/object:Gem::Requirement
+  requirement: &2153879460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152461700
+  version_requirements: *2153879460
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2152460260 !ruby/object:Gem::Requirement
+  requirement: &2153878740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152460260
+  version_requirements: *2153878740
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &2152459020 !ruby/object:Gem::Requirement
+  requirement: &2153860880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152459020
+  version_requirements: *2153860880
 description: longer description of your gem
 email: modeverv@gmail.com
 executables: []
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -929083950517649274
+      hash: -3518175125855602385
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: one-line summary of your gem