kindlemail 0.2.6 → 0.2.7

data/README.md

@@ -3,7 +3,7 @@ simple application because I'm too lazy to faff about attaching items to emails
 I prefer to use the CLI.
 
 ## Information
-This will only work with Ruby 1.9 or greater (it has been tested on 1.9.2 specifically)
+This has been tested on ruby 1.9.2 and has had cursory testing on 1.8.7
 
 ## Notice
 **DISCLAIMER** Users of the 3G Kindle will get charged fees for using the personal-document service so please

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/kindlemail.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kindlemail}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Harper"]
@@ -41,13 +41,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/djhworld/kindlemail}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Push documents to your kindle via the personal document service}
   s.test_files = [
     "test/test_kindle_mailer.rb"
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/KindleMail.rb

@@ -18,11 +18,13 @@ module KindleMail
       if !File.exists?(dirname)
         Dir.mkdir(dirname) 
         create_storage_dir
+        create_staging_dir
         create_user_conf_file
         create_user_email_conf_file
       else     
         create_user_conf_file if !File.exists?(USER_CONF_FILE)
         create_storage_dir if !File.exists?(File.expand_path(STORAGE_DIR))
+        create_staging_dir if !File.exists?(File.expand_path(STAGING_DIR))
         create_user_email_conf_file if !File.exists?(EMAIL_CONF_FILE)
       end
     end
@@ -31,6 +33,10 @@ module KindleMail
       Dir.mkdir(File.expand_path(STORAGE_DIR))
     end
 
+    def create_staging_dir
+      Dir.mkdir(File.expand_path(STAGING_DIR))
+    end
+
     def create_user_conf_file
       root = File.expand_path(File.dirname(__FILE__))
       root = File.expand_path("../conf_templates", root)

data/lib/KindleMailer.rb

@@ -1,4 +1,6 @@
 require 'gmail-mailer'
+require 'fileutils'
+require 'digest/md5'
 require 'constants.rb'
 class KindleMailer
   attr_accessor :kindle_address
@@ -16,8 +18,13 @@ class KindleMailer
       filepath = File.expand_path(file)
       validate_file_path(filepath)
 
+
       puts "Preparing #{File.basename(filepath)} to be sent to #{@kindle_address}"
 
+      if(File.extname(filepath).eql?(".mobi"))
+        filepath = stage_file(filepath)
+      end
+
       message = GmailMailer::Message.new(@kindle_address)
       message.add_attachment(filepath)
       
@@ -25,9 +32,11 @@ class KindleMailer
       mailer.send(message)
     rescue 
       raise 
+    ensure
+      FileUtils.rm(filepath) if(File.extname(filepath).eql?(".mobi"))
     end
 
-    puts "#{File.basename(filepath)} was successfully sent to #{@kindle_address}"
+    puts "#{File.basename(file)} was successfully sent to #{@kindle_address}"
     return true
   end
   
@@ -42,4 +51,15 @@ class KindleMailer
     raise ArgumentError, "#{addr} does not appear to be a valid kindle address" if !addr.end_with?("@kindle.com")
     return true 
   end
+
+  def stage_file(filepath)
+    new_filename=create_filename(filepath)
+    new_location = File.expand_path(STAGING_DIR + "/" + new_filename)
+    FileUtils.cp(filepath, new_location)
+    new_location
+  end
+
+  def create_filename(file)
+    new_filename = Digest::MD5.file(file).to_s+"_"+rand(1000000).to_s+File.extname(file)
+  end
 end 

data/lib/constants.rb

@@ -15,6 +15,7 @@ VALID_FILE_TYPES = {
 SEE_HELP = "\nUse the -h flag for usage details"
 USER_DIR = "~/.kindlemail"
 STORAGE_DIR = USER_DIR + "/.storage"
+STAGING_DIR = USER_DIR + "/.staging"
 EMAIL_CONF_FILE = File.expand_path(USER_DIR + "/.email_conf")
 USER_CONF_FILE = File.expand_path(USER_DIR + "/.kindlemail")
 
@@ -28,3 +29,4 @@ AUTHOR = "djhworld"
 VERSION_STRING = "kindlemail #{APP_VERSION}. Written by #{AUTHOR}. #{HOMEPAGE}"
 FILE_STORE = File.expand_path(STORAGE_DIR + "/sent_files.history")
 
+

data/test/test_kindle_mailer.rb

@@ -12,7 +12,7 @@ class TestKindleMailer < Test::Unit::TestCase
   end
 
   def test_send_with_nil_kindle_address
-    assert_raise(ArgumentError) { @mailer.send(nil, "file") }
+    assert_raise(ArgumentError) { @mailer.send(nil, "file.txt") }
   end
 
   def test_validate_kindle_address_with_nil_addr

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: kindlemail
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Daniel Harper
@@ -19,101 +18,95 @@ date: 2011-01-17 00:00:00 +00:00
 default_executable: kindlemail
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: bundler
-  type: :development
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 5
         - 2
         version: 1.5.2
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: gmail-mailer
-  type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 4
         - 5
         version: 0.4.5
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: trollop
-  type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 83
         segments: 
         - 1
         - 16
         - 2
         version: 1.16.2
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: gmail-mailer
-  type: :runtime
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 4
         - 5
         version: 0.4.5
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: trollop
-  type: :runtime
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 83
         segments: 
         - 1
         - 16
         - 2
         version: 1.16.2
-  requirement: *id006
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
 description: Sends documents to a designated kindle address painlessly and via the CLI. No need to fumble around with clumsy attachment boxes so forth, just whack in the documents you want to send and hit enter
 email: djharperuk@gmail.com
 executables: 
@@ -156,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2549843167680941989
       segments: 
       - 0
       version: "0"
@@ -165,14 +158,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Push documents to your kindle via the personal document service