ruby-rescuetime 0.0.5 → 0.0.6

data/lib/rescuetime/application.rb

@@ -2,6 +2,14 @@ module Rescuetime
   class Application
     include Rescuetime::Debug
 
+    # NEW && UNTESTED
+    def self.to_yaml(apps = [])
+      yaml = "---\n"
+      [*apps].each { |app| yaml += app.to_yaml }
+
+      return yaml
+    end
+
     def self.current_application_name
       cmd = <<-CMD
         xprop -id `xprop -root |
@@ -113,31 +121,35 @@ module Rescuetime
       return out
     end
 
+    def to_yaml
+      to_upload_data
+    end
+
 
 
     private
-      def finish!
-        @active = false
-        @finished_at = Time.now
-      end
-
-      def current_application_name
-        application_name(self.class.current_application_name)
-      end
-
-      def current_window_title
-        window_title(self.class.current_window_title)
-      end
-
-      # To be overwritten
-      def application_name(name)
-        name
-      end
-
-      # To be overwritten
-      def window_title(title)
-        title
-      end
+    def finish!
+      @active = false
+      @finished_at = Time.now
+    end
+
+    def current_application_name
+      application_name(self.class.current_application_name)
+    end
+
+    def current_window_title
+      window_title(self.class.current_window_title)
+    end
+
+    # To be overwritten
+    def application_name(name)
+      name
+    end
+
+    # To be overwritten
+    def window_title(title)
+      title
+    end
   end
 end
 

data/lib/rescuetime/config.rb

@@ -22,7 +22,8 @@ module Rescuetime
         :path     => nil
       }.merge(options)
 
-      @debug        = options[:debug]
+      debug! if options[:debug]
+
       @config_path  = options[:config] || File.join(options[:path] || DEFAULT_PATH, DEFAULT_FILE)
       config        = read_config(@config_path)
 
@@ -31,6 +32,7 @@ module Rescuetime
         :password => options[:password] || config[:password],
         :path     => DEFAULT_PATH       || config[:path]
       }
+
       update if @config != config
     end
 
@@ -59,25 +61,25 @@ module Rescuetime
 
 
     private
-      def read_config(path)
-        create_config_file(path) unless File.exist?(path)
-        YAML::load(File.open(path))
-      end
+    def read_config(path)
+      create_config_file(path) unless File.exist?(path)
+      YAML::load(File.open(path))
+    end
 
-      def create_config_file(path)
-        write_config_file(DEFAULT_CONFIG, path)
-      end
+    def create_config_file(path)
+      write_config_file(DEFAULT_CONFIG, path)
+    end
 
-      def update_config(config, path)
-        write_config_file(config, path)
-      end
+    def update_config(config, path)
+      write_config_file(config, path)
+    end
 
-      def write_config_file(config, path)
-        FileUtils.mkdir_p(File.dirname(path))
-        File.open(path, 'w') do |f|
-          f.write(YAML::dump(config))
-        end
+    def write_config_file(config, path)
+      FileUtils.mkdir_p(File.dirname(path))
+      File.open(path, 'w') do |f|
+        f.write(YAML::dump(config))
       end
+    end
   end
 end
 

data/lib/rescuetime/debug.rb

@@ -6,13 +6,17 @@ module Rescuetime
     end
 
     private
-      # Debug-Wrapper
-      def debug(msg = nil, &block)
-        return unless debug?
+    def debug!(to_debug = true)
+      @debug = to_debug
+    end
+
+    # Debug-Wrapper
+    def debug(msg = nil, &block)
+      return unless debug?
 
-        puts msg if msg
-        yield if block_given?
-      end
+      puts msg if msg
+      yield if block_given?
+    end
   end
 end
 

data/lib/rescuetime/loop.rb

@@ -2,6 +2,8 @@ module Rescuetime
   class Loop
     include Rescuetime::Debug
 
+    attr_reader :config
+
     # =Creates and run a new Rescuetime::Loop:
     #   Rescuetime::Loop.new({
     #     :email    => "foo@example.com",
@@ -21,12 +23,13 @@ module Rescuetime
 
       @config = Config.new(options)
 
-      @debug  = @config.debug?
+      debug! if @config.debug?
+
       debug "[OPTIONS]" do p options end
 
-      @apps   = []
+      @apps = []
       @current_app = nil
-      @uploader = Rescuetime::Uploader.new( :debug    => @debug,
+      @uploader = Rescuetime::Uploader.new( :debug    => debug?,
                                             :email    => @config.email,
                                             :password => @config.password)
 
@@ -39,55 +42,130 @@ module Rescuetime
         puts "Please call ruby-rescuetime with correct login credentials."
         puts " * ruby-rescuetime --email foo@example.com --password secret\n OR"
         puts " * edit: #{@config.location}"
-        exit
+        puts "\n[OFFLINE-MODE]"
+      else
+        upload!
+        upload!("failure")
       end
 
-      @running = true
       Signal.trap("INT") do
-        shutdown if @running
+        shutdown! if running?
       end
 
       self.run
     end
 
+    def running!(running = true)
+      @running = running
+    end
+
     def running?
       @running == true
     end
 
     # Handler called if 'Ctrl + C' is pressed
-    def shutdown
-      @running = false
+    def shutdown!
+      running!(false)
       @apps << @current_app
-      yamldata  = @uploader.prepare_data(@apps)
-      success   = @uploader.upload(:yamldata => yamldata)
-      raise "Upload failed" unless success
 
+      backup!
+      upload!
       exit
     end
 
     # Run the loop
     def run
-      @current_app = Application.create(:debug => @debug)
-      puts "[FOCUS] #{@current_app}"
+      running!
+      @current_app = Application.create(:debug => debug?)
 
       while true
         sleep 1 # TODO: move to config
-        new_focus unless @current_app.active?
+        focus_changed if @current_app.finished? || backup?
+      end
+    end
+
+
+
+    ### BACKUP DATA ### (may be moved)
+
+    # NEW && UNTESTED
+    def last_backup_at
+      @last_backup_at ||= Time.now
+    end
+
+    # NEW && UNTESTED
+    def seconds_since_last_backup
+      Time.now - last_backup_at
+    end
+
+    # NEW && UNTESTED
+    # TODO: read from config
+    def backup?
+      @apps.length > 100 || seconds_since_last_backup > 30*60
+    end
+
+    # NEW && UNTESTED
+    def backup!
+      debug "[BACKUP]"
+
+      @last_backup_at = Time.now
+      timestamp = @last_backup_at.to_i
+
+      path = File.join(config.path, "upload", "todo", "#{timestamp}.yaml")
+      FileUtils.mkdir_p(File.dirname(path))
+
+      File.open(path, 'w') do |f|
+        f.write(Rescuetime::Application.to_yaml(@apps))
+      end
+
+      @apps = []
+    end
+
+    # NEW && UNTESTED
+    def upload!(mode = "todo") # possible modes: todo, failure
+      path  = File.join(config.path, "upload", mode, "*.yaml")
+      files = Dir.glob(path)
+
+      success_path = File.join(config.path, "upload", "success")
+      failure_path = File.join(config.path, "upload", "failure")
+
+      # Make sure directories exist
+      FileUtils.mkdir_p(success_path)
+      FileUtils.mkdir_p(failure_path)
+
+      debug "[UPLOAD] #{files.count} files"
+      files.each_with_index do |f, i|
+        debug "#{f} (#{i})"
+        file      = File.open(f, "rb")
+        yamldata  = file.read
+        file.close
+        success   = @uploader.upload(:yamldata => yamldata)
+
+        # CHECK: may another solution for base_name exist?
+        base_name = f.split("/").last
+
+        path = success ? success_path : failure_path
+        path = File.join(path, base_name)
+
+        # HACK: don't copy if mode == failure and failure again
+        FileUtils.mv(f, path) unless !success && mode == "failure"
       end
     end
 
 
 
     private
-      # Old app lost focus, get new one
-      def new_focus
-        @apps << @current_app
-        debug "[OLD FOCUS]" do
-          puts "#{@current_app.to_s}: #{@current_app.active_time} seconds alive\n"
-        end
-        @current_app = Application.create(:debug => @debug)
-        puts "[FOCUS] #{@current_app}"
+    # Old app lost focus, get new one
+    def focus_changed
+      backup! if backup?
+
+      @apps << @current_app
+      debug "\n[OLD FOCUS]" do
+        puts "#{@current_app.to_s}:\n#{@current_app.active_time} seconds alive\n\n"
       end
+      @current_app = Application.create(:debug => debug?)
+      puts "#{@current_app}"
+    end
   end
 end
 

data/lib/rescuetime/uploader.rb

@@ -20,7 +20,8 @@ module Rescuetime
     #     :debug    => false
     #   })
     def initialize(options = {})
-      @debug  = options[:debug]
+      debug! if options[:debug]
+
       @http   = Net::HTTP.new(API_HOST, 443)
       @http.use_ssl = true
 
@@ -28,27 +29,21 @@ module Rescuetime
       @password = options[:password]
     end
 
-    # Convert array of app objects to yamldata
-    def prepare_data(apps)
-      data = "---\n"
-      apps.each { |app| data += app.to_upload_data }
-      debug "[DATA TO SAVE]" do puts data end
-      # YAML::dump(apps)
-
-      return data
-    end
-
     # Service available?
     def connection_alive?
       resp = @http.get(API_HANDSHAKE_PATH)
       resp.code == "200"
     end
 
-    # Upload yamldata
+    # =Uploads yaml-formatted data
+    # ==Usage:
+    #   @uploader.upload(:yamldata => yamldata)
+    # ==Returns:
+    #   true if upload successful, false otherwise
     def upload(options = {})
-      hash = {  :email    => @email,
-                :password => @password,
-                :yamldata => options[:yamldata] }
+      hash = { :email    => @email,
+               :password => @password,
+               :yamldata => options[:yamldata] }
 
       data = []
       hash.each do |key, value|
@@ -59,18 +54,32 @@ module Rescuetime
       debug "[YAMLDATA]" do puts data end
 
       headers = { 'User-agent' => USER_AGENT }
-      resp    = @http.post(API_UPLOAD_PATH, data, headers)
-      debug "[UPLOAD]" do p resp.body end
+
+      begin
+        resp = @http.post(API_UPLOAD_PATH, data, headers)
+      rescue
+        return false
+      end
+
+      debug "[UPLOAD]" do puts resp.body end
 
       return (resp.code == "200" && !resp.body["<error>"])
     end
 
-    # Handshake with login credentials
+    # =Handshake with login credentials
+    # ==Returns:
+    #   true if handshake successful, false otherwise
     def handshake
       data    = "email=#{@email}&password=#{@password}"
       headers = { 'User-agent' => USER_AGENT }
-      resp    = @http.post(API_HANDSHAKE_PATH, data, headers)
-      debug "[HANDSHAKE]" do p resp.body end
+
+      begin
+        resp = @http.post(API_HANDSHAKE_PATH, data, headers)
+      rescue SocketError
+        return false
+      end
+
+      debug "[HANDSHAKE]" do puts resp.body end
 
       return (resp.code == "200" && !resp.body["login failure"])
     end

data/lib/rescuetime/version.rb

@@ -1,4 +1,4 @@
 module RubyRescuetime
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end
 

data/lib/rescuetime/version.rb~

@@ -0,0 +1,4 @@
+module RubyRescuetime
+  VERSION = "0.0.5"
+end
+

data/spec/rescuetime_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper.rb'
 
-describe Rescuetime::Config do
-  it "foobar" do
-    pending
-  end
+describe Rescuetime do
+  pending
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-rescuetime
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &80669200 !ruby/object:Gem::Requirement
+  requirement: &84534550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *80669200
+  version_requirements: *84534550
 description: ! 'Upload your data to: https://www.rescuetime.com'
 email:
 - deradon87@gmail.com
@@ -32,11 +32,11 @@ extra_rdoc_files: []
 files:
 - bin/ruby-rescuetime
 - lib/rescuetime.rb
-- lib/tasks/ruby-rescuetime_tasks.rake
 - lib/rescuetime/config.rb
 - lib/rescuetime/version.rb
 - lib/rescuetime/loop.rb
 - lib/rescuetime/commands.rb
+- lib/rescuetime/version.rb~
 - lib/rescuetime/extensions/gedit.rb
 - lib/rescuetime/extensions/chromium.rb
 - lib/rescuetime/debug.rb
@@ -62,7 +62,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -643785775
+      hash: 61471837
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -643785775
+      hash: 61471837
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/lib/tasks/ruby-rescuetime_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :ruby-rescuetime do
-#   # Task goes here
-# end