dieselup 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 52be0c78bd191755e1db7b2fd627f4b72055162f
-  data.tar.gz: cfc96478c4b6d3e32e95587ce048545ba9392954
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTgwYjliMTgxNTFjNmVmYWYwZmM2YjA4Y2VjYWEyNDExNTNjMjg0Yw==
+  data.tar.gz: !binary |-
+    M2YwMmU2YjEwM2MwNmVjYzg2NjVmNWQ5Y2U5NTBhYjFmYmI3MjE1Mw==
 SHA512:
-  metadata.gz: afb107d0284da6b0755325b2ecfe32e419f3ccec93c8aa2c2213fa713dbae8ca7132e19d8cf2d4282cdf4b2d63ba0f847dba4bc7333e1114127ef45aad1d30d5
-  data.tar.gz: f686d900163f222416e59bdeff5c13434ecff22c2a8f184606a3e81316f5b9e53c51ee065c37daa1662ff3fd8a249f6f8ce7b40fea5b4cc7a842d071cb6b0e7f
+  metadata.gz: !binary |-
+    MmVlYWRhYTcxYTVkZjgwYTJhNzZiZjU3NDUxYWQ5YWQ2MTJiYWUyMGZmZGMz
+    OWUyMWFmNzcwMGM5NTgwNzVlYmVkY2YzMTliMGY3YjdmMWU0YTY2YjNmNTk0
+    Yjk0Mjk4OTI2ODRlMmE5YzFlYTdmMDBhNDY1YWM4MDZiNDQ0ZDI=
+  data.tar.gz: !binary |-
+    YzhiM2VhNzg0MWFjYjQwNDMzZmUyZTVjYTk2M2I3YjM1Y2NiNDMyN2MyOGIz
+    ZjFiNGZkNTBiMzkwMjY5YmI4NzNlYTIxNWUwZTY0YWMyZjBjMDhjNGI3M2Jk
+    ZmQyYWNkNTg2OTc5YWYzMzkxZWQ3ODhlNTE0OWFjYThjNmM5Zjc=

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
+  - 2.0
   - 2.1
-  - 2.2.0
+  - 2.2
 env:
   global:
   - secure: AtVYNnfo2JaqXAe/xXwzCzgJIvWF5D5CiEeu4nhT9fA9HHuxUUyL4SEoMXcdmfdm/ECUucj0LL/Feu7J6GAwDaetLlNqb3zj27CLk89cbAuBoGmU/y4LqALflRm2s7CMNTry13V/uo/gXtdAXN56lEj0+V7OJVrDLtz6OHryvFKjClSJmsyeDmFOLDHpQ+ISnhEFfZ4dZ6GRlPuVs0Gr5GdKL9QFg8WtWZhpacLT87IHyoxVXiOX8x0Egcrgc2UxhJLZ9VHb5du7kUJ384Y3Y8bUVCaIgiU6iV5MMzfga0G7ueE3hNCXVzWSlHoUxuzNtb4sVaw08qperPvMne4uYuE/wZAMNBuby9wmdLs/Sy2pfAP7aLyECHRldvjcxntZbpAoeZ6lZcCchV6opXqKuKNLAdr71kE248Jucl6c2SRNoVS1uAewB+ie+jmHn1Dt0Eg2Ux3jS3ccidzKJ8qf9nPouLSj0OXcl8ijdgEFohEiGfNxW/C/5TEUGCf+5r/TRfthDpwlQtufxEkVjhiO4q7DUVwTkf7sNiONBkOLx0VvMgNMU0fzWofCwaOqLcRjaQiUnAsenSDhjEtpCOn47i+joXeFLNzLtFLilmWyYse78pAtfhhlFbx2+rf95k1+krYrOHe+7yICYdg8kK5Gss1xfo79a/+0kP/DgwvRfeg=

data/README.md

@@ -31,15 +31,23 @@ $ USERNAME=your-username PASSWORD=your-password dieselup <your-topic-ID>
 Cron task example:
 
 ```shell
-*/1 * * * * USERNAME=your-username PASSWORD=your-password dieselup <your-topic-ID> > /dev/null 2>&1
+USERNAME=your-username
+PASSWORD=your-password
+...
+*/1 * * * * dieselup <your-topic-ID> > /dev/null 2>&1
 ```
 
 That's it!
 
+Like PHP?
+---------
+
+Sweet. Check out [PHP dieselup](https://github.com/xcopy/dieselup) 
+
 Contributing
 ------------
 
-1. Fork it ( https://github.com/[my-github-username]/dieselup/fork )
+1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/dieselup.gemspec

@@ -27,5 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.4'
 
   spec.add_runtime_dependency 'activesupport', '~> 4.2'
-  spec.add_runtime_dependency 'nokogiri', '~> 1.6'
+  spec.add_runtime_dependency 'nokogiri', '1.6'
+  spec.add_runtime_dependency 'rainbow', '~> 2.1'
 end

data/lib/dieselup.rb

@@ -1,7 +1,10 @@
 require 'uri'
 require 'net/http'
+require 'active_support/core_ext/object/to_param'
+require 'active_support/core_ext/object/try'
 require 'nokogiri'
 require 'dotenv'
+require 'rainbow'
 
 module Dieselup
   autoload :Base, 'dieselup/base'

data/lib/dieselup/base.rb

@@ -7,20 +7,38 @@ module Dieselup
     end
 
     def up!
-      login
-      post
+      begin
+        login
+        post
+      rescue => e
+        log(e.message, nil, :red)
+      end
     end
 
     def login
+      log('Checking access', :yellow)
+
       response = request(Dieselup::Url::BASE)
       document = Nokogiri::HTML(response.body)
 
-      if document.css('div#userlinks').empty?
-        url = Dieselup::Url.get(act: 'Login', CODE: '01')
-        params = {UserName: ENV['USERNAME'], PassWord: ENV['PASSWORD']}
+      if document.css('a#user_link').empty?
+        log('Logging in', :yellow)
+
+        url = Dieselup::Url.get(app: 'core', module: 'global', section: 'login', do: 'process')
+
+        params = {
+            auth_key: '880ea6a14ea49e853634fbdc5015a024',
+            referer: Dieselup::Url::BASE,
+            ips_username: ENV['USERNAME'],
+            ips_password: ENV['PASSWORD'],
+            rememberMe: 1
+        }
+
         response = request(url, 'POST', params)
       end
 
+      log('Logged in', :green)
+
       response
     end
 
@@ -30,25 +48,31 @@ module Dieselup
       response = request(Dieselup::Url.get(showtopic: ARGV.first))
       document = Nokogiri::HTML(response.body)
 
-      delete_links = document.css('//a[@href*="javascript:delete_post"]').map { |link|
-        link[:href].match(/'([^']+)/).to_a.last
+      delete_links = document.css('a.delete_post').map { |link|
+        link[:href]
       }
 
       if delete_links.any?
+        log('Deleting last UP', :yellow)
+
         request(delete_links.last)
       end
 
       params = {Post: 'UP'}
 
-      hidden_inputs = document.css('//form[@name*="REPLIER"]/input[@type*="hidden"]')
+      hidden_inputs = document.css('//form[@id="ips_fastReplyForm"]/input[@type*="hidden"]')
       hidden_inputs.each do |input|
         params[input[:name]] = input[:value]
       end
 
+      log('Posting new UP', :green)
+
       request(Dieselup::Url::BASE, 'POST', params)
     end
 
     def request(url, method = 'GET', params = {})
+      puts Rainbow("#{method} #{url}").color(:silver).bright
+
       uri = URI(url)
 
       http = Net::HTTP.new(uri.host, uri.port)
@@ -68,11 +92,11 @@ module Dieselup
 
       response = http.request(request)
 
+=begin
       document = Nokogiri::HTML(response.body)
-
       errors = document.xpath('//div[@class="errorwrap"]/p')
-
       raise StandardError, errors.first.text if errors.any?
+=end
 
       cookies = response.get_fields('set-cookie')
       cookies.each do |cookie|
@@ -82,16 +106,16 @@ module Dieselup
       response
     end
 
-=begin
-    def request(url, method = 'GET', params = {})
-      uri = URI.parse(url)
+    def log(message, *colors)
+      color, background, bright = colors
 
-      if method.upcase == 'POST'
-        Net::HTTP.post_form(uri, params)
-      else
-        Net::HTTP.get_response(uri)
+      rainbow = Rainbow(message.to_s).color(color.try(:to_sym) || :white)
+
+      if background
+        rainbow = rainbow.background(background.to_sym)
       end
+
+      puts rainbow
     end
-=end
   end
 end

data/lib/dieselup/url.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/object/to_param'
-
 module Dieselup
   class Url
     BASE = 'https://diesel.elcat.kg/index.php'

data/lib/dieselup/version.rb

@@ -1,3 +1,3 @@
 module Dieselup
-  VERSION = '1.0.1'
+  VERSION = '2.0.0'
 end

data/spec/dieselup_spec.rb

@@ -30,27 +30,17 @@ describe Dieselup do
     it 'should login successfully' do
       response = @base.login
       document = Nokogiri::HTML(response.body)
-
-      expect(response.code).to eq '200'
-      expect(document.at("p:contains(#{ENV['USERNAME']})")).to_not be_nil
+      expect(document.at("a:contains(#{ENV['USERNAME']})")).to_not be_nil
     end
 
-    it 'should send GET request and get successful response' do
+    it 'should send GET request and get HTTP response with status 200 OK' do
       response = @base.request(Dieselup::Url::BASE)
-      document = Nokogiri::HTML(response.body)
-
       expect(response.code).to eq '200'
-      expect(document.at("a:contains(#{ENV['USERNAME']})")).to_not be_nil
     end
 
-    it 'should raise error' do
-      @base.cookies = []
-      ENV['USERNAME'] = nil
-      ARGV.clear
-
-      expect { @base.request(Dieselup::Url.get(showtopic: 1)) }.to raise_error(StandardError)
-      expect { @base.post }.to raise_error(ArgumentError)
-      expect { @base.login }.to raise_error(StandardError)
+    it 'should send GET request and get HTTP response with status 404 Not Found' do
+      response = @base.request(Dieselup::Url.get(showtopic: 1))
+      expect(response.code).to eq '404'
     end
   end
 end

metadata

@@ -1,99 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: dieselup
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Kairat Jenishev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: Lift up your topic to the top in Diesel Forum
 email: kairat.jenishev@gmail.com
 executables:
@@ -101,10 +115,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".env.dist"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .env.dist
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -129,17 +143,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: DieselUp!