kindlemail 0.2.3 → 0.2.4

data/Changelog.md

@@ -1,5 +1,11 @@
 # kindlemail Changelog
 
+### 0.2.4
+* Reconfigured KindleMail CLI to be more streamlined 
+* Added option to view default kindle address
+* Added -i option
+* Reconfigured configuration class for loading conf files
+
 ### 0.2.3
 * Added some further validations on the KindleMailer class
 * Restructured validations

data/TODO.txt

@@ -1,10 +1,9 @@
-Changes needed for 0.1.4
+Changes needed 
 - Fix "user configuration invalid" message to mention the user can use the -k flag
 - Fix email configuration file issues?
 
 Future stuff: -
 - Start to think about moving the lib/ stuff out into a different gem and just seeing this as a pure CLI app?
-- Add flag to view default kindle address
 - Add ability to use multiple kindle addresses?
 - Add ability to add multiple attachments?
 - Add ability to pass in a web URL point to a file

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/kindlemail.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kindlemail}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Harper"]

data/lib/KindleMail.rb

@@ -8,6 +8,10 @@ require 'KindleMailFileDatastore.rb'
 # This contains all the code needed to run the CLI application
 module KindleMail
   class Configuration
+
+    def load_yaml(file)
+      YAML.load_file(file).inject({}){|memo,(k,v)| memo[k.to_sym] = v.to_s; memo}
+    end
     # Create the user framework needed to run the application
     def configuration_setup
       dirname = File.expand_path(USER_DIR)
@@ -42,13 +46,39 @@ module KindleMail
 
     def get_email_credentials
       raise ArgumentError, "Cannot find email credentials file #{EMAIL_CONF_FILE}." if !File.exists?(EMAIL_CONF_FILE)
-      YAML.load_file(EMAIL_CONF_FILE).inject({}){|memo,(k,v)| memo[k.to_sym] = v.to_s; memo}
+      begin
+        load_yaml(EMAIL_CONF_FILE)
+      rescue
+        raise StandardError, "Error parsing #{EMAIL_CONF_FILE}"
+      end
+    end
+
+    def get_user_credentials
+      error_msg =  "The configuration file #{USER_CONF_FILE} was found but appears to be invalid/incomplete.\nThe most likely reason for this is the fact that you need to set a default kindle address to send items to.\nYou must edit the file and follow the instructions in the comments before trying again. Alternatively use the -k flag to specify a kindle address to send the item to" 
+
+      raise ArgumentError, "Cannot find user credentials file #{USER_CONF_FILE}." if !File.exists?(USER_CONF_FILE)
+      begin
+        config = load_yaml(USER_CONF_FILE)
+      rescue
+       raise StandardError, error_msg
+      end
+
+      raise StandardError, error_msg if config.key?(:kindle_addr) == false || config[:kindle_addr].nil?
+      return config
     end
   end
 
   class Application
     attr_reader :cmd_parser
     attr_reader :opts
+
+    def initialize
+      puts "#{VERSION_STRING}\n\n"
+      @datastore = KindleMailFileDatastore.new
+      @config_manager = KindleMail::Configuration.new
+      @config_manager.configuration_setup
+    end
+
     def run
       setup
       process
@@ -72,19 +102,19 @@ module KindleMail
         opt :force, "Send the file regardless of whether you have sent it before", :short => "-f", :default => nil
         opt :show_history, "Show the history of files that have been sent using kindlemail", :short => "-s", :default => nil
         opt :clear_history, "Clear the history of files that have been sent using kindlemail", :short => "-d", :default => nil
+        opt :show_info, "Show information about the way kindlemail is setup", :short => "-i", :default => nil
       end
     end
 
     def process
       begin
-        puts "\n#{VERSION_STRING}\n\n"
-
-        datastore = KindleMailFileDatastore.new
-        config_manager = KindleMail::Configuration.new
-        config_manager.configuration_setup
+        if(@opts[:show_info_given])
+          print_info
+          exit
+        end
 
         if(@opts[:show_history_given])
-          datastore.print_history
+          @datastore.print_history
           exit
         end
 
@@ -102,7 +132,7 @@ module KindleMail
 
           if(do_it)
             print "Clearing file history"
-            datastore.clear_history
+            @datastore.clear_history
             puts "...done"
           end
           exit
@@ -112,15 +142,13 @@ module KindleMail
           raise ArgumentError, "Please specify a file to send (or use the -h option to see help)" 
         end
 
-        mailer = KindleMailer.new(config_manager.get_email_credentials)
-        
-        kindle_address = ""
+        mailer = KindleMailer.new(@config_manager.get_email_credentials)
 
+        kindle_address = ""
         if(!@opts[:kindle_address_given])
           # no -k flag specified, see if a configuration file has been set
           if(File.exist?(USER_CONF_FILE))
-            config = YAML.load_file(USER_CONF_FILE).inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
-            raise ArgumentError, "The configuration file #{USER_CONF_FILE} was found but appears to be invalid/incomplete.\nThe most likely reason for this is the fact that you need to set a default kindle address to send items to.\nYou must edit the file and follow the instructions in the comments before trying again. Alternatively use the -k flag to specify a kindle address to send the item to" if config.key?(:kindle_addr) == false || config[:kindle_addr].nil?
+            config = @config_manager.get_user_credentials
             kindle_address = config[:kindle_addr]
           else
             raise ArgumentError, "No address has been specified to send the item to.\nEither add an address in #{USER_CONF_FILE} or use the -kindle_address (-k) option"
@@ -134,18 +162,49 @@ module KindleMail
         file_to_send = ARGV[0]
 
         if(!force_send)
-          if(datastore.file_exists?(kindle_address, File.basename(file_to_send))) 
+          if(@datastore.file_exists?(kindle_address, File.basename(file_to_send))) 
             raise ArgumentError, "This file has already been sent to #{kindle_address}. Use the --force (-f) option if you want to resend it"
           end
         end
 
         send_result = mailer.send(kindle_address, file_to_send)
-        datastore.add_entry(kindle_address,File.basename(file_to_send)) if send_result
+        @datastore.add_entry(kindle_address,File.basename(file_to_send)) if send_result
 
       rescue ArgumentError => message
         puts "#{message}"
+      rescue => message
+        puts "Error occured: - \n#{message}"
       end
+    end
+    def print_info
+      puts "kindlemail was born out of my own laziness. To put things bluntly" 
+      puts "I'm too lazy to pick up my beloved Kindle, get a usb cable, plug"
+      puts "it into my computer, drag and drop books and documents to it,"
+      puts "unplug the usb cable. Too ardous and involves getting up."
+      puts
+      puts "So I wrote this, it's simple, a bit rubbish, probably doesn't work" 
+      puts "properly but it's useful when I just want to fire off a .mobi book" 
+      puts "to my Kindle and forget about it until later."
+      puts
+      puts "Amazon have made a great service with the Personal Document Service," 
+      puts "although it's worth reminding users of the 3G Kindle that they will" 
+      puts "be charged for using this service"
+      puts 
+      puts "If you hate this application, supress your hatred and tell me what" 
+      puts "you hate about it so I can change it"
+      puts 
+      puts "Version:                #{VERSION}"
+      puts "Homepage:               #{HOMEPAGE}" 
+      puts "Author:                 #{AUTHOR}"
+      puts 
 
+      begin
+        config = @config_manager.get_user_credentials
+      rescue
+        puts "You do not appear to have a valid user credentials file!"
+      else
+        puts "Default kindle address: #{config[:kindle_addr]}\n\n"
+      end
     end
   end
 end

data/lib/constants.rb

@@ -17,7 +17,9 @@ USER_DIR = "~/.kindlemail"
 STORAGE_DIR = USER_DIR + "/.storage"
 EMAIL_CONF_FILE = File.expand_path(USER_DIR + "/.email_conf")
 USER_CONF_FILE = File.expand_path(USER_DIR + "/.kindlemail")
-VERSION = "0.2.3"
-VERSION_STRING = "kindlemail #{VERSION} (January 2011). https://github.com/djhworld/kindlemail"
+VERSION = "0.2.4"
+HOMEPAGE = "https://github.com/djhworld/kindlemail"
+AUTHOR = "djhworld"
+VERSION_STRING = "kindlemail #{VERSION}. Written by #{AUTHOR}. #{HOMEPAGE}"
 FILE_STORE = File.expand_path(STORAGE_DIR + "/sent_files.history")
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Daniel Harper