signaly-notify 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ccb5948a481aa78a08ebbed8ff8cda4c33e9515
-  data.tar.gz: e2901bff258d213961d7982a755aa5b55fee7fc4
+  metadata.gz: c3bf603d022158b24c1caf75d0e0a9b6b5022071
+  data.tar.gz: e9041e6655295aed2d4030e1b6027d224373567c
 SHA512:
-  metadata.gz: 758f07968904bba363def2bef562ac2a450db0c34f7074a29722c6155b2ca1fdf56d743a5dab50ea0475708a7aa227a3641de0d586eb35ab9e1cb14a05a2c8f3
-  data.tar.gz: 78aa078ec0218bcde21dac1ea229766ba07c7da19870a740a05a0098d130705b79e66744452ea6d5cfd66e12ecbc34223e6b3364079e96bd801b884f4ed5e7f2
+  metadata.gz: 4b7a7c0a2cfa6843014e3029792bd1eb402973b8a7aa6687f95e6402ef1515b9e5f823cd2c7cec4b3c471a7dfab3c506609f8d37cd22108e212779511fff58c5
+  data.tar.gz: 59eb092b6f9510f2212f6061c3479027809365926c2aa9298dd0ee0894dedc919712a06a9f6f88cda9655274004a9066a9bac3d939501bd3a802f3b6072851a7

data/bin/signaly-notify.rb

@@ -1,4 +1,4 @@
 #!/bin/env ruby
 
 require 'signaly'
-Signaly::NotifyApp.new.call ARGV
+Signaly::CLI.new.call ARGV

data/bin/signaly-tray.rb

@@ -0,0 +1,18 @@
+#!/bin/env ruby
+
+require 'signaly'
+require 'green_shoes'
+
+::Shoes.app :title => "signaly.cz" do
+  systray do
+    syst_icon 'signaly.png'
+    
+    syst_add_button "Login" do |state|
+      edit_conf()
+    end
+    
+	  syst_add_sepratator
+    
+	  syst_quit_button true
+  end
+end

data/lib/signaly.rb

@@ -1,25 +1,8 @@
-require 'mechanize'
-require 'colorize'
-require 'highline'
-require 'optparse'
-require 'yaml'
+require 'autoloaded'
 
-# optional gems for visual notifications
-begin
-  require 'libnotify'
-rescue LoadError
+module Signaly
+  Autoloaded.module do |autoloading|
+    # hints for loading of non-conventional constants
+    autoloading.with :CLI
+  end
 end
-
-begin
-  require 'ruby-growl'
-rescue LoadError
-end
-
-
-%w(
-client
-notifier
-notify_app
-status_outputter
-status
-).each {|l| require_relative "signaly/#{l}" }

data/lib/signaly/cli.rb

@@ -0,0 +1,130 @@
+require 'highline'
+require 'optparse'
+require 'yaml'
+
+module Signaly
+  # collects configuration, starts NotifyApp
+  class CLI
+    DEFAULT_CONFIG_PATH = "#{ENV['HOME']}/.config/signaly-notify/config.yaml"
+
+    def call(argv)
+      options = process_options(argv)
+      config = Config.default
+               .merge(config_file(options.config_file))
+               .merge(options)
+      config = config.merge(find_available_notifier) if config.notify.nil?
+      request_config config
+
+      Signaly::NotifyApp.new.call config
+    end
+
+    private
+
+    def process_options(argv)
+      config = Config.new
+      optparse = OptionParser.new do |opts|
+        opts.on "-u", "--user NAME", "user name used to log in" do |n|
+          config.login = n
+        end
+
+        opts.on "-p", "--password WORD", "user's password" do |p|
+          config.password = p
+        end
+
+        opts.separator "If you don't provide any of the options above, "\
+                       "the program will ask you to type the name and/or password on its start. "\
+                       "(And especially "\
+                       "for the password it's probably a bit safer to type it this way than "\
+                       "to type it on the commandline.)\n\n"
+
+        opts.on "-s", "--sleep SECS", Integer, "how many seconds to sleep between two checks (default is #{config.sleep_seconds})" do |s|
+          config.sleep_seconds = s
+        end
+
+        opts.on "-r", "--remind SECS", Integer, "if I don't bother about the contents I recieved a notification about, remind me after X seconds (default is #{config.remind_after}; set to 0 to disable)" do |s|
+          config.remind_after = s
+        end
+
+        opts.on "--notify NOTIFIER", "choose visual notification engine (possible values: libnotify|growl|notifysend)" do |s|
+          config.notify = s.to_sym
+        end
+
+        opts.on "--console-only", "don't display any visual notifications" do
+          config.console_only = true
+        end
+
+        opts.on "-d", "--debug", "print debugging information to STDERR" do
+          config.debug_output = true
+        end
+
+        opts.on "--url URL", "check URL different from the default (for developmeng)" do |s|
+          config.url = s
+        end
+
+        opts.on "--skip-login", "don't login (for development)" do
+          config.skip_login = true
+        end
+
+        opts.on "-h", "--help", "print this help" do
+          puts opts
+          exit 0
+        end
+
+        opts.on "-c", "--config FILE", "configuration file" do |f|
+          config.config_file = f
+        end
+      end
+      optparse.parse! argv
+
+
+      unless argv.empty?
+        STDERR.puts "Warning: unused commandline arguments: "+ARGV.join(', ')
+      end
+
+      return config
+    end
+
+    # ask the user for missing essential information
+    def request_config(config)
+      cliio = HighLine.new
+      config.login ||= cliio.ask("login: ")
+      config.password ||= cliio.ask("password: ") {|q| q.echo = '*' }
+    end
+
+    # load configuration from config file
+    def config_file(path=nil)
+      path ||= DEFAULT_CONFIG_PATH
+
+      if File.exist? path then
+        cfg = YAML.load(File.open(path))
+        # symbolize keys
+        cfg = cfg.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+        return cfg
+      end
+
+      return nil
+    end
+
+    def find_available_notifier
+      config = Signaly::Config.new
+
+      begin
+        require 'libnotify'
+
+        config.notify = :libnotify
+        return config
+      rescue LoadError
+      end
+
+      begin
+        require 'ruby-growl'
+
+        config.notify = :growl
+        return config
+      rescue LoadError
+      end
+
+      return config
+    end
+  end
+end

data/lib/signaly/client.rb

@@ -1,16 +1,17 @@
+require 'mechanize'
+
 module Signaly
   # interaction with signaly.cz
+  # (through the regular web interface intended for humans)
   class Client
 
     def initialize(config)
-      @username = config.login
-      @password = config.password
-
+      @config = config
       @agent = Mechanize.new
 
       @dbg_print_pages = config.debug_output || false # print raw html of all request results?
 
-      @checked_page = config.url || 'https://www.signaly.cz/'
+      @checked_page = @config.url || 'https://www.signaly.cz/'
     end
 
     USERMENU_XPATH = ".//div[contains(@class, 'section-usermenu')]"
@@ -25,20 +26,14 @@ module Signaly
       unless login_form
         raise "Login form not found on the index page!"
       end
-      login_form['name'] = @username
-      login_form['password'] = @password
+      login_form['name'] = @config.login
+      login_form['password'] = @config.password
 
       page = @agent.submit(login_form)
       debug_page_print "first logged in", page
 
-      errors = page.search(".//div[@class='alert alert-error']")
-      if errors.size > 0 then
-        msg = ''
-        errors.each {|e| msg += e.text.strip+"\n" }
-        raise "Login to signaly.cz failed: "+msg
-      end
-
       usermenu = page.search(USERMENU_XPATH)
+      usermenu &&= usermenu.xpath("./div[@class='item username']")
       if usermenu.empty? then
         raise "User-menu not found. Login failed or signaly.cz UI changed again."
       end
@@ -73,7 +68,7 @@ module Signaly
       return if ! @dbg_print_pages
 
       STDERR.puts
-      STDERR.puts ("# "+title).colorize(:yellow)
+      STDERR.puts ColorizedString.new("# "+title).yellow
       STDERR.puts
       STDERR.puts page.search(".//div[@class='navbar navbar-fixed-top section-header']")
       STDERR.puts

data/lib/signaly/config.rb

@@ -0,0 +1,44 @@
+module Signaly
+  Config = Struct.new(
+    :sleep_seconds, # between checks
+    :remind_after, # the first notification
+    :notification_showtime,
+    :debug_output,
+    :login,
+    :password,
+    :url, # of the checked page
+    :skip_login,
+    :config_file,
+    :console_only,
+    :notify
+  )
+
+  class Config
+    def self.default
+      defaults = new
+      # how many seconds between two checks of the site
+      defaults.sleep_seconds = 60
+      # if there is some pending content and I don't look at it,
+      # remind me after X seconds
+      defaults.remind_after = 60*5
+      # for how long time the notification shows up
+      defaults.notification_showtime = 10
+      defaults.debug_output = false
+      defaults.password = nil
+      return defaults
+    end
+
+    # merges the config structs so that the last one
+    # in the argument list has the highest priority and value nil is considered
+    # empty
+    def merge(other)
+      merged = dup
+
+      merged.members.each do |key|
+        merged[key] = other[key] if other[key]
+      end
+
+      return merged
+    end
+  end
+end

data/lib/signaly/console_outputter.rb

@@ -0,0 +1,34 @@
+require 'colorized_string'
+
+module Signaly
+  class ConsoleOutputter < StatusOutputter
+    def output(new_status, old_status)
+      print_line new_status, old_status
+      set_console_title new_status
+    end
+
+    private
+
+    def print_line(new_status, old_status)
+      t = Time.now
+
+      puts # start on a new line
+      print t.strftime("%H:%M:%S")
+
+      [:pm, :notifications, :invitations].each do |what|
+        num = new_status[what].to_s
+        if new_status.changed?(old_status, what) then
+          num = ColorizedString.new(num).red
+        end
+        print "  #{what}: #{num}"
+      end
+      puts
+    end
+
+    # doesn't work....
+    def set_console_title(status)
+      t = "signaly-notify: #{status[:pm]}/#{status[:notifications]}"
+      `echo -ne "\\033]0;#{t}\\007"`
+    end
+  end
+end

data/lib/signaly/growl_outputter.rb

@@ -0,0 +1,17 @@
+begin
+  require 'ruby-growl'
+rescue LoadError
+end
+
+module Signaly
+  class GrowlOutputter < StatusOutputter
+    def output(new_status, old_status)
+      text = [:pm, :notifications, :invitations].collect do |what|
+        "#{what}: #{new_status[what]}"
+      end.join "\n"
+
+      notif = Growl.new 'localhost', 'ruby-growl', 'GNTP'
+      notif.notify('signaly.cz', 'signaly.cz', text)
+    end
+  end
+end

data/lib/signaly/libnotify_outputter.rb

@@ -0,0 +1,17 @@
+# optional gems for visual notifications
+begin
+  require 'libnotify'
+rescue LoadError
+end
+
+module Signaly
+  class LibnotifyOutputter < StatusOutputter
+    def output(new_status, old_status)
+      text = [:pm, :notifications, :invitations].collect do |what|
+        "#{what}: #{new_status[what]}"
+      end.join "\n"
+
+      Libnotify.show(:body => text, :summary => "signaly.cz", :timeout => @config.notification_showtime)
+    end
+  end
+end

data/lib/signaly/notify_app.rb

@@ -1,29 +1,6 @@
 module Signaly
   class NotifyApp
-
-    SNConfig = Struct.new(:sleep_seconds, # between checks
-                      :remind_after, # the first notification
-                      :notification_showtime,
-                      :debug_output,
-                      :login,
-                      :password,
-                      :url, # of the checked page
-                      :skip_login,
-                      :config_file,
-                      :console_only,
-                      :notify)
-
-    DEFAULT_CONFIG_PATH = ".config/signaly-notify/config.yaml"
-
-    def call(argv)
-      options = process_options(argv)
-      config = merge_structs(
-        default_config,
-        config_file(options.config_file),
-        options
-      )
-      ask_config config
-
+    def call(config)
       notifier = Notifier.new
       prepare_outputters config, notifier
 
@@ -32,120 +9,19 @@ module Signaly
 
     private
 
-    # load configuration from config file
-    def config_file(path=nil)
-      path ||= File.join ENV['HOME'], DEFAULT_CONFIG_PATH
-
-      if File.exist? path then
-        cfg = YAML.load(File.open(path))
-        # symbolize keys
-        cfg = cfg.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
-        return cfg
-      end
-
-      return nil
-    end
-
-    def process_options(argv)
-      config = SNConfig.new
-      optparse = OptionParser.new do |opts|
-        opts.on "-u", "--user NAME", "user name used to log in" do |n|
-          config.login = n
-        end
-
-        opts.on "-p", "--password WORD", "user's password" do |p|
-          config.password = p
-        end
-
-        opts.separator "If you don't provide any of the options above, "\
-                       "the program will ask you to type the name and/or password on its start. "\
-                       "(And especially "\
-                       "for the password it's probably a bit safer to type it this way than "\
-                       "to type it on the commandline.)\n\n"
-
-        opts.on "-s", "--sleep SECS", Integer, "how many seconds to sleep between two checks (default is #{config.sleep_seconds})" do |s|
-          config.sleep_seconds = s
-        end
-
-        opts.on "-r", "--remind SECS", Integer, "if I don't bother about the contents I recieved a notification about, remind me after X seconds (default is #{config.remind_after}; set to 0 to disable)" do |s|
-          config.remind_after = s
-        end
-
-        opts.on "--notify NOTIFIER", "choose visual notification engine (possible values are 'libnotify' and 'growl')" do |s|
-          config.notify = s.to_sym
-        end
-
-        opts.on "--console-only", "don't display any visual notifications" do
-          config.console_only = true
-        end
-
-        opts.on "-d", "--debug", "print debugging information to STDERR" do
-          config.debug_output = true
-        end
-
-        opts.on "--url URL", "check URL different from the default (for developmeng)" do |s|
-          config.url = s
-        end
-
-        opts.on "--skip-login", "don't login (for development)" do
-          config.skip_login = true
-        end
-
-        opts.on "-h", "--help", "print this help" do
-          puts opts
-          exit 0
-        end
-
-        opts.on "-c", "--config FILE", "configuration file" do |f|
-          config.config_file = f
-        end
-      end
-      optparse.parse! argv
-
-
-      unless argv.empty?
-        STDERR.puts "Warning: unused commandline arguments: "+ARGV.join(', ')
-      end
-
-      return config
-    end
-
-    # ask the user for missing essential information
-    def ask_config(config)
-      cliio = HighLine.new
-      config.login ||= cliio.ask("login: ")
-      config.password ||= cliio.ask("password: ") {|q| q.echo = '*' }
-    end
-
-    # merges the config structs so that the last one
-    # in the argument list has the highest priority and value nil is considered
-    # empty
-    def merge_structs(*structs)
-      merged = structs.shift.dup
-
-      merged.each_pair do |key, value|
-        structs.each do |s|
-          next if s.nil?
-          if s[key] != nil then
-            merged[key] = s[key]
-          end
-        end
-      end
-
-      return merged
-    end
-
     def prepare_outputters(config, notifier)
-      notifier.add_outputter ConsoleOutputter.new(config), :checked
+      notifier.add_outputter Signaly::ConsoleOutputter.new(config), :checked
 
       return if config.console_only
       return unless config.notify
 
       case config.notify.to_sym
       when :libnotify
-        notifier.add_outputter LibNotifyOutputter.new(config), :changed, :remind
+        notifier.add_outputter Signaly::LibnotifyOutputter.new(config), :changed, :remind
       when :growl
-        notifier.add_outputter GrowlOutputter.new(config), :changed, :remind
+        notifier.add_outputter Signaly::GrowlOutputter.new(config), :changed, :remind
+      when :notifysend
+        notifier.add_outputter Signaly::NotifySendOutputter.new(config), :changed, :remind
       end
     end
 
@@ -185,25 +61,5 @@ module Signaly
         sleep config.sleep_seconds
       end
     end
-
-    def default_config
-      defaults = SNConfig.new
-      # how many seconds between two checks of the site
-      defaults.sleep_seconds = 60
-      # if there is some pending content and I don't look at it,
-      # remind me after X seconds
-      defaults.remind_after = 60*5
-      # for how long time the notification shows up
-      defaults.notification_showtime = 10
-      defaults.debug_output = false
-      defaults.password = nil
-      # use first available visual notification engine
-      if defined? Libnotify
-        defaults.notify = :libnotify
-      elsif defined? Growl
-        defaults.notify = :growl
-      end
-      return defaults
-    end
   end
 end

data/lib/signaly/notify_send_outputter.rb

@@ -0,0 +1,14 @@
+module Signaly
+  # sends desktop notification using the command-line utility
+  # notify-send (useful for those who have installed libnotify,
+  # but not the Ruby bindings)
+  class NotifySendOutputter < StatusOutputter
+    def output(new_status, old_status)
+      text = [:pm, :notifications, :invitations].collect do |what|
+        "#{what}: #{new_status[what]}"
+      end.join "\n"
+
+      `notify-send "#{text}"`
+    end
+  end
+end

data/lib/signaly/status_outputter.rb

@@ -7,56 +7,4 @@ module Signaly
     def output(new_status, old_status)
     end
   end
-
-  class ConsoleOutputter < StatusOutputter
-    def output(new_status, old_status)
-      print_line new_status, old_status
-      set_console_title new_status
-    end
-
-    private
-
-    def print_line(new_status, old_status)
-      t = Time.now
-
-      puts # start on a new line
-      print t.strftime("%H:%M:%S")
-
-      [:pm, :notifications, :invitations].each do |what|
-        num = new_status[what].to_s
-        if new_status.changed?(old_status, what) then
-          num = num.colorize(:red)
-        end
-        print "  #{what}: #{num}"
-      end
-      puts
-    end
-
-    # doesn't work....
-    def set_console_title(status)
-      t = "signaly-notify: #{status[:pm]}/#{status[:notifications]}"
-      `echo -ne "\\033]0;#{t}\\007"`
-    end
-  end
-
-  class LibNotifyOutputter < StatusOutputter
-    def output(new_status, old_status)
-      text = [:pm, :notifications, :invitations].collect do |what|
-        "#{what}: #{new_status[what]}"
-      end.join "\n"
-
-      Libnotify.show(:body => text, :summary => "signaly.cz", :timeout => @config.notification_showtime)
-    end
-  end
-
-  class GrowlOutputter < StatusOutputter
-    def output(new_status, old_status)
-      text = [:pm, :notifications, :invitations].collect do |what|
-        "#{what}: #{new_status[what]}"
-      end.join "\n"
-
-      notif = Growl.new 'localhost', 'ruby-growl', 'GNTP'
-      notif.notify('signaly.cz', 'signaly.cz', text)
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signaly-notify
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jakub Pavlík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-26 00:00:00.000000000 Z
+date: 2019-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -52,10 +52,25 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-description: "signaly-notify.rb is a simple script \nlogging in with your user data
-  to the social network https://signaly.cz \nand notifying you - by the means of printing
-  to the console \nas well as sending a visual notification using libnotify - \nwhen
-  something new happens.\nCurrently it only detects pending private messages and notifications."
+- !ruby/object:Gem::Dependency
+  name: autoloaded
+  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: |-
+  signaly-notify.rb signs in with your credentials
+  to the social network https://signaly.cz
+  and triggers a desktop notification whenever something new happens.
+  It detects pending private messages, notifications and invitations.
 email: jkb.pavlik@gmail.com
 executables:
 - signaly-notify.rb
@@ -63,10 +78,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/signaly-notify.rb
+- bin/signaly-tray.rb
 - lib/signaly.rb
+- lib/signaly/cli.rb
 - lib/signaly/client.rb
+- lib/signaly/config.rb
+- lib/signaly/console_outputter.rb
+- lib/signaly/growl_outputter.rb
+- lib/signaly/libnotify_outputter.rb
 - lib/signaly/notifier.rb
 - lib/signaly/notify_app.rb
+- lib/signaly/notify_send_outputter.rb
 - lib/signaly/status.rb
 - lib/signaly/status_outputter.rb
 homepage: http://github.com/igneus/signaly-notify
@@ -90,9 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: notification script for signaly.cz (Czech christian social network)
 test_files: []
-has_rdoc: