qiita_mail 0.1.0 → 0.3.0

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in qiita_mail.gemspec
 gemspec
+
+gem 'rake'

data/LICENSE.txt

@@ -0,0 +1,24 @@
+=================
+QiitaMail
+=================
+
+Copyright (c) 2012 ongaeshi
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/qiita_mail/cli_core.rb

@@ -32,17 +32,19 @@ module QiitaMail
 
     def deliver
       # ピックアップ
+      puts "-- #{Time.now} --"
       puts "Pickup <---- Qiita.com"
       mail_body = pickup_and_format(:html)
       
       # メールの送信
       puts "Send mail -> #{@settings.email}"
-      mailer = Mailer.new(@settings.email, mail_body)
+      mailer = Mailer.new(@settings.email_from, @settings.email, mail_body)
       mailer.deliver
     end
 
     def file(format, filename = nil)
       # ピックアップ
+      puts "-- #{Time.now} --"
       puts "Pickup  <------ Qiita.com"
       mail_body = pickup_and_format(format)
       

data/lib/qiita_mail/mailer.rb

@@ -10,8 +10,9 @@ require 'mail'
 
 module QiitaMail
   class Mailer
-    def initialize(to, body)
+    def initialize(from, to, body)
       @mail = Mail.new do
+        from    from
         to      to
         subject 'Qiita Mail'
         # body    mail_body

data/lib/qiita_mail/settings.rb

@@ -39,6 +39,10 @@ module QiitaMail
       @data['email']
     end
 
+    def email_from
+      @data['email_from'] || @data['email']
+    end
+
     def keywords
       @data['keywords']
     end

data/lib/qiita_mail/version.rb

@@ -1,3 +1,3 @@
 module QiitaMail
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

data/test/data/qiita_mail_from.yaml

@@ -0,0 +1,9 @@
+---
+email: 'qiita_mail@example.com'
+email_from: 'qiita_mail_from@example.com'
+
+keywords:
+  - ruby
+  - javascript
+
+  

data/test/test_settings.rb

@@ -19,6 +19,7 @@ module QiitaMail
     def test_empty
       obj = Settings.new('.qiita_mail.yaml') # データが無い場合は新規作成
       assert_equal "", obj.email
+      assert_equal "", obj.email_from
       assert_equal [], obj.keywords
       assert_equal true, obj.empty?
       obj.save
@@ -27,10 +28,17 @@ module QiitaMail
     def test_exist_yaml
       obj = Settings.new(tmp_path('../data/qiita_mail.yaml'))
       assert_equal "qiita_mail@example.com", obj.email
+      assert_equal "qiita_mail@example.com", obj.email_from
       assert_equal ['ruby', 'javascript'], obj.keywords
       assert_equal false, obj.empty?
     end
 
+    def test_exist_yaml_from
+      obj = Settings.new(tmp_path('../data/qiita_mail_from.yaml'))
+      assert_equal "qiita_mail@example.com", obj.email
+      assert_equal "qiita_mail_from@example.com", obj.email_from
+    end
+
     def teardown
       teardown_custom(true)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiita_mail
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153154780 !ruby/object:Gem::Requirement
+  requirement: &2157687640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153154780
+  version_requirements: *2157687640
 - !ruby/object:Gem::Dependency
   name: qiita
-  requirement: &2153154260 !ruby/object:Gem::Requirement
+  requirement: &2157687220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153154260
+  version_requirements: *2157687220
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &2153153620 !ruby/object:Gem::Requirement
+  requirement: &2157686800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153153620
+  version_requirements: *2157686800
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153152780 !ruby/object:Gem::Requirement
+  requirement: &2157686380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153152780
+  version_requirements: *2157686380
 description: Write a gem description
 email:
 - ongaeshi0621@gmail.com
@@ -65,6 +65,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE.txt
 - Rakefile
 - bin/qiita_mail
 - lib/qiita_mail.rb
@@ -82,6 +83,7 @@ files:
 - qiita_mail.gemspec
 - test/data/pickup_cache.marshal
 - test/data/qiita_mail.yaml
+- test/data/qiita_mail_from.yaml
 - test/file_test_utils.rb
 - test/test_cli.rb
 - test/test_helper.rb
@@ -114,6 +116,7 @@ summary: Write a gem summary
 test_files:
 - test/data/pickup_cache.marshal
 - test/data/qiita_mail.yaml
+- test/data/qiita_mail_from.yaml
 - test/file_test_utils.rb
 - test/test_cli.rb
 - test/test_helper.rb