turksatkablo_cli 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 311eaf860709698d53cc493af1066842ae00f6bd
-  data.tar.gz: 27ae9da5b9c30f17edb31ad0316c8d6c37838489
+  metadata.gz: 1230eb0c37e81a750dac3f03c0e635b6f778e8d8
+  data.tar.gz: b79102395e62f1f9a992376f7472400094944f08
 SHA512:
-  metadata.gz: 41fbb59695a2bf141327fd1ba0b75fe3f60795968d7cae8b7a60be4e97172d65449930f8192beb4bfd4f5c1d0037f8a23575940dcd899d6b5d201e2928147137
-  data.tar.gz: 179f8727dcadd54a16b5490d5521803750aa0b01dd2c6a7178cbcc4043ac80e05a01e21735a94e73836b349ed2cdb29a96aa47a6eba8eb8d2474942d3d05c00a
+  metadata.gz: a490e09b11ba616bb24d4ce2f8163e400a41eaaa2e02ecbfe052e317d0938c85cc83c9351270e32bc32e8282fa5b78ba95a2481c9cee119c0f007b0b4ebaa35c
+  data.tar.gz: ffe7d6086cb40e455c8e82641cc706aff80efe25817136c9427d92a876aaa21303e4db657fa0ec314cf9353472bb9a7d20a0a14dd8fdeda528419b1391bab84b

data/.gitignore

@@ -33,5 +33,3 @@ Gemfile.lock
 
 # Dotenv
 .env
-
-.byebug_history

data/README.md

@@ -1,5 +1,6 @@
 Turksat Kablo CLI :black_medium_square:
 =================
+[![Gem Version](https://badge.fury.io/rb/turksatkablo_cli.svg)](https://badge.fury.io/rb/turksatkablo_cli)
 
 A command-line interface for the Turksat Kablo Online Islemler - https://online.turksatkablo.com.tr/
 
@@ -10,7 +11,8 @@ A command-line interface for the Turksat Kablo Online Islemler - https://online.
 
 ## Setup
 
-turksatkablo_cli supports Ruby (MRI) 2.0+
+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/).
+
 
 1. Install via rubygems
 
@@ -38,3 +40,15 @@ turksatkablo kotadetay       # Son 3 ayın günlük takibi v.s
 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
++ 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.
+
+### Contributing
+
+turksatkablo_cli is open source, and contributions are very welcome!

data/bin/turksatkablo

@@ -20,7 +20,11 @@ end
 at_exit{
   # cleanup temp files
   # close open connections
-  Capybara.current_session.driver.quit
+  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,7 +5,11 @@ 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|
-  Capybara::Poltergeist::Driver.new(app, options)
+  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/online_operations/agent.rb

@@ -1,12 +1,11 @@
 require 'highline'
 
-
 module TurksatkabloCli
   module OnlineOperations
     class Agent
       include Helpers
       attr_accessor :login_choose, :username, :password, :radio_btn_value,
-      :fail_login_attempt, :session
+      :fail_login_attempt, :session, :has_logged_in, :auth
 
       def initialize
         @session =  Capybara::Session.new(:poltergeist)
@@ -15,27 +14,26 @@ module TurksatkabloCli
         email: {username_label: "E-mail", password_label: "Şifre", radio_btn_value: 4},
         ceptelefonu: {username_label: "Cep Telefonu (Başında 0 olmadan 10 haneli olmalı.)", password_label: "Şifre", radio_btn_value: 5} }
         @fail_login_attempt = 0
+        @has_logged_in = false
+      end
 
+      def has_logged_in?
+        agent.has_logged_in
       end
 
       def authenticated?
         begin
-          if agent.session.current_url != Enums::BASE_URL_SUCCESS
+          if has_logged_in?
+            true
+          else
             auth = TurksatkabloCli::OnlineOperations::Auth.instance
             set_login_data(auth)
 
-            if agent.session.current_url != Enums::BASE_URL
-              if agent.user_authenticated?
-                true
-              else
-                false
-              end
-            else
+            if has_logged_in?
               true
+            else
+              user_authenticated? if @fail_login_attempt == 0
             end
-
-          else
-            true
           end
         rescue Exception => e
           false
@@ -65,7 +63,6 @@ module TurksatkabloCli
       end
 
 
-
       def end_session
        @session.driver.quit
        @session = nil
@@ -76,53 +73,49 @@ module TurksatkabloCli
      end
 
      def retry_authenticate
-      if (@fail_login_attempt == 0)
+      if @fail_login_attempt == 0
         puts "Türksat Kablo Online İşlemler sayfasına şuan ulaşılamıyor, tekrar deniyoruz..."
         @fail_login_attempt = 1
 
         user_authenticated?
       else
         puts "Türksat Kablo Online İşlemler sayfasına şuan ulaşılamıyor."
-        @fail_login_attempt = 0
-
         false
       end
     end
 
     def user_authenticated?
       begin
-        if @session.current_url != Enums::BASE_URL_SUCCESS
-          visit_status = @session.visit(Enums::BASE_URL)
-          if visit_status["status"] == 'success' && @session.current_url == Enums::BASE_URL
-            @fail_login_attempt = 0
-            puts "#{Enums::BASE_URL} adresine erişim başarılı. Giriş yapılıyor..."
 
-            @session.find(:css, "div.radio-container div:nth-child(#{self.radio_btn_value}) > label").click
-            kullanici_id = @session.find('input#KullaniciID')
-            kullanici_id.send_keys(self.username)
+        visit_status = @session.visit(Enums::BASE_URL)
 
-            kullanici_sifre = @session.find('input#KullaniciSifre')
-            kullanici_sifre.send_keys(self.password)
+        if visit_status["status"] == 'success' && @session.current_url == Enums::BASE_URL
+          @fail_login_attempt = 0
+          puts "#{Enums::BASE_URL} adresine erişim başarılı. Giriş yapılıyor..."
 
-            @session.find_link(id: 'Button1').click
+          @session.find(:css, "div.radio-container div:nth-child(#{self.radio_btn_value}) > label").click
+          kullanici_id = @session.find('input#KullaniciID')
+          kullanici_id.send_keys(self.username)
 
-            if @session.current_url == Enums::BASE_URL_SUCCESS
-              puts "\nGiriş işlemi başarılı"
-              add_line
+          kullanici_sifre = @session.find('input#KullaniciSifre')
+          kullanici_sifre.send_keys(self.password)
 
+          @session.find_link(id: 'Button1').click
 
-              true
-            else
-              puts "\nGiriş bilgileriniz hatalı, kontrol ederek tekrar deneyiniz."
-              add_line
+          if @session.current_url == Enums::BASE_URL_SUCCESS
+            puts "\nGiriş işlemi başarılı"
+            add_line
+            self.has_logged_in = true
 
-              get_login
-            end
+            true
           else
-            retry_authenticate
+            puts "\nGiriş bilgileriniz hatalı, kontrol ederek tekrar deneyiniz."
+            add_line
+
+            get_login
           end
         else
-          true
+          retry_authenticate
         end
 
       rescue Exception => e
@@ -130,15 +123,20 @@ module TurksatkabloCli
       end
     end
 
-     private
-     def set_login_data(auth)
-       if auth.login_data.kind_of?(Hash)
+    private
+    def set_login_data(auth)
+      if auth.login_data.kind_of?(Hash) && !has_login_data?
         agent.username = auth.login_data[:username]
         agent.password = auth.login_data[:password]
         agent.radio_btn_value = auth.login_data[:radio_btn_value]
+      end
+    end
 
+    def has_login_data?
+      if agent.username.nil? || agent.password.nil? || agent.radio_btn_value.nil?
+        false
       else
-
+        true
       end
     end
 

data/lib/turksatkablo_cli/online_operations/auth.rb

@@ -8,7 +8,8 @@ module TurksatkabloCli
     class Auth
       include Singleton
       include Helpers
-      attr_reader :path, :login_type, :login_data
+      attr_reader :path, :login_type
+      attr_accessor :login_data
 
       FILE_NAME = '.turksatkablo'.freeze
       KEY = "m\x13\x95\xBE6\x81\xEEN\xE6\xDC\xA0\x83K\xE8X2\a\xD7\xB2\x94L\xF2\xEC\xF9\x80\x9F_\xDB\xDB\xD05\v".freeze
@@ -16,23 +17,28 @@ module TurksatkabloCli
 
       def initialize
         @path = File.join(File.expand_path('~'), FILE_NAME)
+
         @login_data = get
       end
 
+      def save_login_info
+        login_info = { :radio_btn_value => agent.radio_btn_value, :username => agent.username,
+         :password => agent.password }
+
+         save_file(login_info) if @path
+         puts "Bilgileriniz bilgisayarınızda şifrelenerek saklandı." if File.exists?(@path)
 
-      def get
+         login_info
+       end
+
+       def get
         return read_file if File.exists?(@path)
         begin
           if agent.get_login
+            save_login_info
 
-            login_info = { :radio_btn_value => agent.radio_btn_value, :username => agent.username,
-             :password => agent.password }
-
-             save_file(login_info) if @path
-             puts "Bilgileriniz bilgisayarınızda şifrelenerek saklandı." if File.exists?(@path)
-             login_info
-           end
-         rescue Exception => e
+          end
+        rescue Exception => e
           puts "Bir sorun oluştu."
         end
       end

data/lib/turksatkablo_cli/online_operations/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turksatkablo_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Samet Gunaydin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2017-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler