ifin24-client 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/ifin24

@@ -1,21 +1,75 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
-
-require 'yaml'
 require 'mechanize'
 require 'highline/import'
 
+require 'optparse'
+require 'ostruct'
+
 require 'ifin24'
 
-def main
-  config = Ifin24::Configuration.instance
-  client = Ifin24::Client.new(config[:login], config[:password])
-  console = Ifin24::Console.new(client)
-  console.main_menu
+class App
+
+  def initialize(arguments)
+    @arguments = arguments
+
+    # Set defaults
+    @options = OpenStruct.new
+    @options.verbose = false
+    @options.quiet = false
+  end
+
+  def run
+    parse_options
+
+    config = Ifin24::Configuration.instance
+    login = @options.login || config[:login]
+    password = @options.password || config[:password]
+    client = Ifin24::Client.new(login, password)
+
+    if client.logged?
+      console = Ifin24::Console.new(client)
+      console.main_menu
+    else
+      puts "Bad login or password."
+    end
+  end
+
+  protected
+
+  def parse_options
+    # Specify options
+    opts = OptionParser.new
+    opts.set_summary_indent('  ')
+    script_name = File.basename($0)
+    opts.banner = "Usage: #{script_name} [OPTIONS]"
+    opts.define_head "Abstract description of script"
+
+    opts.separator ""
+    opts.separator "Mandatory arguments to long options are mandatory for short options too."
+    opts.separator ""
+
+    opts.on("-l", "--login", "User login") do |login|
+      @options.login = login
+    end
+
+    opts.on("-p", "--password", "User password") do |password|
+      @options.password = password
+    end
+
+    opts.on_tail("-h", "--help", "Show this help message.") do
+      puts opts
+      exit
+    end
+
+    opts.parse!(@arguments) rescue return false
+  end
+
 end
 
-main
+# Create and run the application
+app = App.new(ARGV)
+app.run

data/lib/ifin24.rb

@@ -8,4 +8,3 @@ module Ifin24
   autoload :Models, 'ifin24/models'
 
 end
-

data/lib/ifin24/client.rb

@@ -67,6 +67,10 @@ class Ifin24::Client
     return entries, total_pages
   end
 
+  def logged?
+    @logged
+  end
+
   private
 
   def login(login, password)
@@ -76,7 +80,8 @@ class Ifin24::Client
     form['login'] = login
     form['password'] = password
 
-    form.submit
+    page = form.submit
+    @logged = page.forms.first.nil?
   end
 
   def fetch_categories

data/lib/ifin24/configuration.rb

@@ -1,4 +1,5 @@
 require 'singleton'
+require 'yaml'
 
 class Ifin24::Configuration
   include Singleton

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ifin24-client
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - "\xC5\x81ukasz Bandzarewicz"