rhack 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f28c3cb05c65018360d52ba98547da0bff2c3a66
-  data.tar.gz: 431e6835d84fecbaf1f6c236a7862da94dd02db7
+  metadata.gz: c009239c6fbd460ac03d66f1d5c9120625bd444e
+  data.tar.gz: 20a9a3b468d1cb046a5cc8f570e8e5bb4fe3538d
 SHA512:
-  metadata.gz: dfdd4a627e508816fb3df12b3fcbb088dddbd947e469bae035ca6a9a28370a0f5e37f8e13d164e7ec4dc8d70ed79283cfe9d0a682377b9e2d27a06ec7f15e67e
-  data.tar.gz: 6af36ff47a3acfdd9cc47ee979dcfbd4c8b1d4a5a993070198a6b6754db83dd2f50eaacb11d90f12cbdd1599b8e59971de56eb4ad562dc96a367b122e2c56438
+  metadata.gz: 765f9ad74e11d35c647498eb7e42e6a4a8ba8f15d0a11a1be8e2611b0fb26213b9f8265172c126b4dbeb69c9e26a194b84283f585e6faea1e49c23144164027a
+  data.tar.gz: 08b87a49dde4b46bf372545a348f2f4dfa0d282c55e5c4a1589d9d4ff9a9105315193c1d5926558be1f33522536c0a37b11b74acf8eed3c3a02e252a4ae3922f

data/config/rhack.yml.template

@@ -1,4 +1,4 @@
-# By default, Scout uses randomly chosen ua (string from specified fiel)
+# By default, Scout uses randomly chosen ua (string from specified file)
 # for User-Agent header
 useragents: 
   desktop: config/uas.txt
@@ -23,19 +23,19 @@ scout:
 # Defaults to a file @ RAILS_PATH/config/RAILS_ENV.yml
 # Rhack is intended to use a database only for caching,
 # so I've came to a conclusion that Redis is the most suitable choice
-# redis.conf can be generated using `rake redis:config`
-# Delete this block to disable Redis connection at all 
-db:
-  redis:
-    configfilename: config/redis.conf
-    socket: tmp/sockets/redis.socket
-    pidfile: tmp/pids/redis.pid
-    port: 0
-    hostname: localhost
-    dbfilename: db/redis-dump.rdb
-    db: 0
-    save:
-    # "run BGSAVE every minute if anything have changed"
-    - 60 1
-    # You can change it to whatever you want and just use Redis#bgsave before exit Ruby
+# redis.conf can be generated using `rake redis:config` from this gem dir
+# Unomment this block to enable Redis connection
+#db:
+#  redis:
+#    configfilename: config/redis.conf
+#    socket: tmp/sockets/redis.socket
+#    pidfile: tmp/pids/redis.pid
+#    port: 0
+#    hostname: localhost
+#    dbfilename: db/redis-dump.rdb
+#    db: 0
+#    save:
+#    # "run BGSAVE every minute if anything have changed"
+#    - 60 1
+#    # You can change it to whatever you want and just use Redis#bgsave before exit Ruby
   

data/lib/generators/rhack/config_generator.rb

@@ -0,0 +1,11 @@
+module Rhack
+  module Generators
+    class ConfigGenerator < Rails::Generators::Base
+      source_root File.expand_path('../config', __FILE__)
+      
+      def generate_config
+        copy_file "rhack.yml.template", "config/rhack.yml"
+      end
+    end
+  end
+end

data/lib/rhack/clients/base.rb

@@ -9,7 +9,14 @@ module RHACK
     attr_accessor :f
     alias_constant :URI
     
-    def initialize(service, frame=nil, *args)
+    def self.inherited(child)
+      child.class_eval {
+        include RHACK
+        __init__
+      }
+    end
+    
+    def initialize(service=:api, frame=nil, *args)
       @service = service
       # first argument should be a string so that frame won't be static
       @f = frame || Frame(URI(service) || URI(:login), *args)

data/lib/rhack/curl/global.rb

@@ -40,6 +40,7 @@ module Curl
         # until main thread has sleep a bit, $CarierThread will have status "run", 
         # no matter whether it's idling or performing requests
         sleep 0.001
+        true
       end
     end
     alias :run :execute

data/lib/rhack/scout.rb

@@ -238,14 +238,16 @@ module RHACK
           # в сорцах on_failure не вызывается по коду 0, это какой-то глюк
           # в любом случае такой поворот не означает ошибки
           L.warn "Got Curl::Err::CurlOK, response was: #{c.res}"
+          load!
         else
-          @http.on_complete &Proc::NULL
           c.outdate!
           if retry? e
             L.debug "#{e[0]} -> reloading scout"
             #load uri, headers, not_redir, relvl, &callback
             load! # all params including post_body are still set
+            # DO they include `on_complete'?
           else
+            @http.on_complete &Proc::NULL
             L.debug "#{e[0]} -> not reloading scout"
             raise *e if @raise_err
           end

data/lib/rhack/version.rb

@@ -1,3 +1,3 @@
 module RHACK
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/rhack.gemspec

@@ -17,12 +17,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   
   spec.add_runtime_dependency "activesupport"
-  spec.add_runtime_dependency "redis"
-  spec.add_runtime_dependency "rmtools", ">= 1.3.3"
+  #spec.add_runtime_dependency "redis"
+  spec.add_runtime_dependency "rmtools", ">= 2.3.0"
   spec.add_runtime_dependency "libxml-ruby"
   
   spec.extensions << 'ext/curb/extconf.rb'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhack
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sergey Baev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,34 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rmtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +128,7 @@ files:
 - ext/curb/curb_upload.c
 - ext/curb/curb_upload.h
 - ext/curb/extconf.rb
+- lib/generators/rhack/config_generator.rb
 - lib/rhack.rb
 - lib/rhack/clients.rb
 - lib/rhack/clients/base.rb