kindlemail 0.1.6 → 0.2.0

data/Changelog.md

@@ -1,5 +1,9 @@
 # kindlemail Changelog
 
+### 0.2.0
+* Changed email conf template to need less credentials
+* Updated to use gmail-mailer version 0.4.2
+
 ### 0.1.5
 * Reconfigured bin/ file to work properly with require_relative
 * Changed lib/KindleMail.rb to use relative filepaths

data/Gemfile

@@ -8,6 +8,6 @@ source "http://rubygems.org"
 group :development do
     gem "bundler", "~> 1.0.0"
     gem "jeweler", "~> 1.5.2"
-    gem "gmail-mailer", "~> 0.1.1"
+    gem "gmail-mailer", "= 0.4.2"
     gem "trollop", "~> 1.16.2"
 end

data/Gemfile.lock

@@ -3,9 +3,9 @@ GEM
   specs:
     activesupport (3.0.3)
     git (1.2.5)
-    gmail-mailer (0.1.1)
+    gmail-mailer (0.4.2)
       gmail_xoauth (~> 0.3.0)
-      mail (~> 2.2.13)
+      mail (~> 2.2.14)
     gmail_xoauth (0.3.0)
       oauth (>= 0.3.6)
     i18n (0.5.0)
@@ -31,6 +31,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  gmail-mailer (~> 0.1.1)
+  gmail-mailer (= 0.4.2)
   jeweler (~> 1.5.2)
   trollop (~> 1.16.2)

data/Rakefile

@@ -20,7 +20,7 @@ Jeweler::Tasks.new do |gem|
   gem.email = "djharperuk@gmail.com"
   gem.authors = ["Daniel Harper"]
   gem.required_ruby_version = '>= 1.9.2'
-  gem.add_dependency "gmail-mailer", "~> 0.1.1"
+  gem.add_dependency "gmail-mailer", "= 0.4.2"
   gem.add_dependency "trollop", "~> 1.16.2"
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/conf_templates/.email_conf

@@ -1,11 +1,5 @@
 # This contains the mail credentials required to send emails using your gmail account
-# uncomment the lines below and insert your details
 #
-smtp_server: smtp.gmail.com
-smtp_port: 587
-smtp_consumer_key: anonymous
-smtp_consumer_secret: anonymous
 smtp_oauth_token: 
 smtp_oauth_token_secret: 
-host: gmail.com
 email: 

data/kindlemail.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kindlemail}
-  s.version = "0.1.6"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Harper"]
-  s.date = %q{2011-01-13}
+  s.date = %q{2011-01-14}
   s.default_executable = %q{kindlemail}
   s.description = %q{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}
   s.email = %q{djharperuk@gmail.com}
@@ -51,24 +51,24 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<gmail-mailer>, ["~> 0.1.1"])
+      s.add_development_dependency(%q<gmail-mailer>, ["= 0.4.2"])
       s.add_development_dependency(%q<trollop>, ["~> 1.16.2"])
-      s.add_runtime_dependency(%q<gmail-mailer>, ["~> 0.1.1"])
+      s.add_runtime_dependency(%q<gmail-mailer>, ["= 0.4.2"])
       s.add_runtime_dependency(%q<trollop>, ["~> 1.16.2"])
     else
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<gmail-mailer>, ["~> 0.1.1"])
+      s.add_dependency(%q<gmail-mailer>, ["= 0.4.2"])
       s.add_dependency(%q<trollop>, ["~> 1.16.2"])
-      s.add_dependency(%q<gmail-mailer>, ["~> 0.1.1"])
+      s.add_dependency(%q<gmail-mailer>, ["= 0.4.2"])
       s.add_dependency(%q<trollop>, ["~> 1.16.2"])
     end
   else
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<gmail-mailer>, ["~> 0.1.1"])
+    s.add_dependency(%q<gmail-mailer>, ["= 0.4.2"])
     s.add_dependency(%q<trollop>, ["~> 1.16.2"])
-    s.add_dependency(%q<gmail-mailer>, ["~> 0.1.1"])
+    s.add_dependency(%q<gmail-mailer>, ["= 0.4.2"])
     s.add_dependency(%q<trollop>, ["~> 1.16.2"])
   end
 end

data/lib/KindleMail.rb

@@ -34,14 +34,15 @@ module KindleMail
     end
 
     def create_user_email_conf_file
+      puts "Creating user email conf file"
       root = File.expand_path(File.dirname(__FILE__))
       root = File.expand_path("../conf_templates", root)
-      FileUtils.cp(File.join(root, '/.email_conf'), USER_CONF_FILE)
+      FileUtils.cp(File.join(root, '/.email_conf'), EMAIL_CONF_FILE)
     end
 
     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; memo}
+      YAML.load_file(EMAIL_CONF_FILE).inject({}){|memo,(k,v)| memo[k.to_sym] = v.to_s; memo}
     end
   end
 

data/lib/KindleMailer.rb

@@ -15,8 +15,15 @@ class KindleMailer
 
     puts "Preparing #{File.basename(filepath)} to be sent to #{@kindle_address}"
 
-    mailer = GmailMailer::Mailer.new(@email_credentials)
-    mailer.sendMessage(GmailMailer::Message.new(@kindle_address, "a@b.c", filepath))
+    begin
+      message = GmailMailer::Message.new(@kindle_address)
+      message.add_attachment(filepath)
+      
+      mailer = GmailMailer::Mailer.new(@email_credentials)
+      mailer.send(message)
+    rescue ArgumentError => error_msg
+      raise 
+    end
 
     puts "#{File.basename(filepath)} was successfully sent to #{@kindle_address}"
     return true

data/lib/constants.rb

@@ -17,7 +17,7 @@ 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.1.6"
+VERSION = "0.2.0"
 VERSION_STRING = "kindlemail #{VERSION} (January 2011). https://github.com/djhworld/kindlemail"
 FILE_STORE = File.expand_path(STORAGE_DIR + "/sent_files.history")
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Daniel Harper
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +00:00
+date: 2011-01-14 00:00:00 +00:00
 default_executable: kindlemail
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,13 +52,13 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 1
-        version: 0.1.1
+        - 4
+        - 2
+        version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: *id003
@@ -82,13 +82,13 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 1
-        version: 0.1.1
+        - 4
+        - 2
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: *id005