turksatkablo_cli 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1230eb0c37e81a750dac3f03c0e635b6f778e8d8
-  data.tar.gz: b79102395e62f1f9a992376f7472400094944f08
+  metadata.gz: b19ab32c3aae669255dfdf8167dfd170b2c615f0
+  data.tar.gz: 7b6fa7332994494a2a18dfa0516d66dcd93e7e55
 SHA512:
-  metadata.gz: a490e09b11ba616bb24d4ce2f8163e400a41eaaa2e02ecbfe052e317d0938c85cc83c9351270e32bc32e8282fa5b78ba95a2481c9cee119c0f007b0b4ebaa35c
-  data.tar.gz: ffe7d6086cb40e455c8e82641cc706aff80efe25817136c9427d92a876aaa21303e4db657fa0ec314cf9353472bb9a7d20a0a14dd8fdeda528419b1391bab84b
+  metadata.gz: 706d9059ccddc262168fae94f222897c680112daefde5d868a00e7ad37dd3c14b2fca65491e957f4d602c1b38b67dfbe6e2e4cd4a74900073fe17d769b8c9f75
+  data.tar.gz: c7bfac791558500ea4f8039949ee0e2554e4ef131d5d38066d806da93aaf12c80f0a119192342db31a85c912f48edb454d87407a0d0af638a2605c1fcaaf213c

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/README.md

@@ -11,7 +11,7 @@ A command-line interface for the Turksat Kablo Online Islemler - https://online.
 
 ## Setup
 
-turksatkablo_cli is built with Ruby, so you'll need a working Ruby 2.1.0>= environment to use it. You can find Ruby installation instructions [here](https://www.ruby-lang.org/en/installation/).
+turksatkablo_cli is built with Ruby, so you'll need a working Ruby 2.2.0>= environment to use it. You can find Ruby installation instructions [here](https://www.ruby-lang.org/en/installation/).
 
 
 1. Install via rubygems
@@ -41,14 +41,19 @@ turksatkablo musterino       # Müşteri no - kısa kodu mn
 turksatkablo ozet            # Hizmetler genel durum - kısa kodu o
 ```
 
-### Changelog
-
-+ 0.1.4 – Fix retry_authenticate and authenticated? methods, login details could not be saved when base url was not reachable
+## Changelog
++ 0.2.0 – Add `RSpec` and `environment` tests, required `ruby` version updated (2.2.0 >=), `nokogiri` version updated (has a known critical severity security vulnerability in version range < 1.8.1)
++ 0.1.4 – Fix retry_authenticate and authenticated? methods (login details could not be saved after the retry_authenticate method)
 + 0.1.3 – Modernize multiple classes, add `ozet`, `hizmetler`, `musterino`, `kampanya`, `anlikborc` commands
 + 0.1.2 – Modernize Agent and Auth classes, ability to save user's encrypted login details, add `kota` command.
 + 0.1.1 – Build app skeleton, implement basic authentication
 + 0.1.0 - Initial version.
 
+### Development
+```bash
+bundle exec rspec -fd spec
+```
+
 ### Contributing
 
 turksatkablo_cli is open source, and contributions are very welcome!

data/bin/turksatkablo

@@ -1,13 +1,15 @@
 #!/usr/bin/env ruby
 ## encoding: utf-8
 
-if RUBY_VERSION < '2.1.0'
-  abort "turksatkablo_cli requires Ruby 2.1.0 or higher"
-end
-
 lib_dir = File.expand_path("../../lib", __FILE__)
 $LOAD_PATH.unshift lib_dir if File.directory?(lib_dir)
 
+require 'turksatkablo_cli/online_operations/helpers'
+require 'turksatkablo_cli/online_operations/enums'
+
+TurksatkabloCli::OnlineOperations::Helpers.check_ruby_version
+TurksatkabloCli::OnlineOperations::Helpers.check_is_installed?("phantomjs", TurksatkabloCli::OnlineOperations::Enums::PHANTOM_JS_REQUIRED)
+
 require 'turksatkablo_cli'
 
 # catch control-c and exit
@@ -20,11 +22,7 @@ end
 at_exit{
   # cleanup temp files
   # close open connections
-  begin
     Capybara.current_session.driver.quit
-  rescue Exception => e
-    abort "turksatkablo_cli requires phantomjs https://github.com/rokumatsumoto/turksatkablo_cli#setup"
-  end
 }
 
 TurksatkabloCli.main

data/lib/init/poltergeist.rb

@@ -5,11 +5,7 @@ require 'capybara/poltergeist'
 # See more options at https://github.com/teampoltergeist/poltergeist#customization
 options = { js_errors: false, phantomjs_options: ['--load-images=no', '--ignore-ssl-errors=yes'] }
 Capybara.register_driver :poltergeist do |app|
-  begin
     Capybara::Poltergeist::Driver.new(app, options)
-  rescue Exception => e
-    abort "turksatkablo_cli requires phantomjs https://github.com/rokumatsumoto/turksatkablo_cli#setup"
-  end
 end
 
 # Configure Capybara to use Poltergeist as the driver

data/lib/turksatkablo_cli.rb

@@ -1,5 +1,3 @@
-require 'turksatkablo_cli/online_operations/helpers'
-require 'turksatkablo_cli/online_operations/enums'
 require 'turksatkablo_cli/online_operations/version'
 require 'turksatkablo_cli/base'
 require 'turksatkablo_cli/online_operations/agent'

data/lib/turksatkablo_cli/online_operations/agent.rb

@@ -5,7 +5,7 @@ module TurksatkabloCli
     class Agent
       include Helpers
       attr_accessor :login_choose, :username, :password, :radio_btn_value,
-      :fail_login_attempt, :session, :has_logged_in, :auth
+      :fail_login_attempt, :session, :has_logged_in
 
       def initialize
         @session =  Capybara::Session.new(:poltergeist)

data/lib/turksatkablo_cli/online_operations/auth.rb

@@ -17,7 +17,6 @@ module TurksatkabloCli
 
       def initialize
         @path = File.join(File.expand_path('~'), FILE_NAME)
-
         @login_data = get
       end
 

data/lib/turksatkablo_cli/online_operations/cli.rb

@@ -28,7 +28,7 @@ module TurksatkabloCli
       desc "kota", "Kalan kota - kısa kodu k"
       def kota
         if agent.authenticated?
-          puts @session.find(:css, "div.circle-container div.toplam span").text + " GB AKN Kaldı."
+          @session.find(:css, "div.circle-container div.toplam p").all("span, sub").map(&:text).each { |val| puts val }
         end
       end
       map "k" => "kota"

data/lib/turksatkablo_cli/online_operations/enums.rb

@@ -22,6 +22,8 @@ module TurksatkabloCli
       define :KAMPANYA_ADI, "KAMPANYA ADI"
       define :TAAHHUT_BAS_TRH, "TAAHHÜT BAŞLANGIÇ TARİHİ"
       define :TAAHHUT_BIT_TRH, "TAAHHÜT BİTİŞ TARİHİ"
+
+      define :PHANTOM_JS_REQUIRED, "turksatkablo_cli requires phantomjs https://github.com/rokumatsumoto/turksatkablo_cli#setup"
     end
   end
 end

data/lib/turksatkablo_cli/online_operations/helpers.rb

@@ -1,16 +1,10 @@
 require 'open3'
 require 'net/ping'
 
-
 module TurksatkabloCli
   module OnlineOperations
     module Helpers
 
-      def run(*commands)
-        stdin, stdout, stderr, w = Open3.popen3(*commands)
-        [stdout.gets(nil), stderr.gets(nil), w.value]
-      end
-
       def internet_connection?
         begin
           Net::Ping::External.new("8.8.8.8").ping?
@@ -41,6 +35,32 @@ module TurksatkabloCli
         puts "\n"
       end
 
+      def self.check_ruby_version(ruby_version = RUBY_VERSION)
+        if ruby_version < '2.2.0'
+          abort "turksatkablo_cli requires Ruby 2.2.0 or higher"
+        else
+          ruby_version
+        end
+      end
+
+      def self.check_is_installed?(command, err_msg)
+        if which(command)
+          true
+        else
+          abort(err_msg)
+        end
+      end
+
+      def self.which(command)
+        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+          exts.each { |ext|
+            exe = File.join(path, "#{command}#{ext}")
+            return exe if File.executable?(exe) && !File.directory?(exe)
+          }
+        end
+        return nil
+      end
 
     end
   end

data/lib/turksatkablo_cli/online_operations/version.rb

@@ -1,5 +1,5 @@
 module TurksatkabloCli
   module OnlineOperations
-    VERSION = "0.1.4"
+    VERSION = "0.2.0"
   end
 end

data/spec/helper_spec.rb

@@ -0,0 +1,23 @@
+RSpec.describe "environment" do
+
+  it "ruby version is >= 2.2.0" do
+    expect(TurksatkabloCli::OnlineOperations::Helpers.check_ruby_version("2.4.2")).to be >= "2.1.0"
+  end
+
+  it "ruby version is < 2.2.0" do
+    expect { TurksatkabloCli::OnlineOperations::Helpers.check_ruby_version("2.1.0") }.to raise_error(SystemExit)
+  end
+
+  it "phantomjs needs to be in path" do
+    expect(TurksatkabloCli::OnlineOperations::Helpers.check_is_installed?("phantomjs", TurksatkabloCli::OnlineOperations::Enums::PHANTOM_JS_REQUIRED)).to be_truthy
+  end
+
+  it "ruby is in path" do
+    expect(TurksatkabloCli::OnlineOperations::Helpers.which("ruby")).to be_instance_of(String)
+  end
+
+  it "phantom_jsx is not in path" do
+    expect { TurksatkabloCli::OnlineOperations::Helpers.check_is_installed?("phantom_jsx", "phantom_jsx is not in path") }.to raise_error(SystemExit)
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,24 @@
+
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'rspec'
+require 'turksatkablo_cli/online_operations/helpers'
+require 'turksatkablo_cli/online_operations/enums'
+
+module SpecHelper
+end
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+  config.include(SpecHelper)
+end

data/turksatkablo_cli.gemspec

@@ -27,16 +27,16 @@ Gem::Specification.new do |spec|
   #   f.match(%r{^(test|spec|features)/})
   # end
 
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = '>= 2.2.0'
   spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   spec.files         = `git ls-files`.split("\n")
   spec.require_paths = ["lib"]
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'rspec', '~> 3.0'
 
   spec.add_runtime_dependency "thor", '~> 0.20.0'
   spec.add_runtime_dependency 'highline', '~> 1.7', '>= 1.7.8'
-  spec.add_runtime_dependency 'nokogiri', '1.7.1'
   spec.add_runtime_dependency 'rack', '1.6.8'
   spec.add_runtime_dependency 'rack-test', '0.7.0'
   spec.add_runtime_dependency 'net-ping', '~> 2.0', '>= 2.0.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turksatkablo_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Samet Gunaydin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-02 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -72,20 +86,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.8
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.7.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +219,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -237,6 +238,8 @@ files:
 - lib/turksatkablo_cli/online_operations/enums.rb
 - lib/turksatkablo_cli/online_operations/helpers.rb
 - lib/turksatkablo_cli/online_operations/version.rb
+- spec/helper_spec.rb
+- spec/spec_helper.rb
 - turksatkablo_cli.gemspec
 homepage: https://github.com/rokumatsumoto/turksatkablo_cli
 licenses:
@@ -251,7 +254,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="