mayaml-mutt 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acdbec8f0604e742602962780c944b08549e4903
-  data.tar.gz: e5ade5cc55f3333e3d4da1a4760efc30c78ffa22
+  metadata.gz: 332a8954d08d49e253f062c350f3a1d149337df3
+  data.tar.gz: d890d9ebb4f350bf7d3a105c58f716967e71ba41
 SHA512:
-  metadata.gz: 969227caa1d2f5b205c3971c67fd59e9b876159c690f697302c0763a04ccbc6491e0cc99f0cce757d139c92391477b64ec2829dd3edfa141aaac2a8740284a46
-  data.tar.gz: 01cefc680e310c99cd40a6e5bf64ee77dc47d88ab8e476c3281884084559e22ddcf493fc63fa0d912b2ce745813f24baa60962ed0b446d0f1a12ec7291666a0d
+  metadata.gz: 252016b2d8b977a8acfa35ba1c1b50a18134f4b5e18a2540ee3fe72a95dda4ae8b276bdfb4f5712044369bca9c39996d5d4fe9cd372b5bc5fb0acd6b6d1a048b
+  data.tar.gz: fcb21896a4001522f9ab09142c7c5f15f494641bb70fbaa39d78a23ccc41e1fd83167041d34cc970753a068a5e8a72029a023e433429a413df958cf96fab9b8f

data/CHANGELOG.md

@@ -1,20 +1,27 @@
-=== 3.0.0 (2016.09.07)
+### 4.0.0 (2017.04.06)
+
+* update to use mayaml v4
+* update license
+* fix travis integration
+* cleanup and refactor
+
+### 3.0.0 (2016.09.07)
 
 * skip v2 release to be compatible with mayaml version
 * update to use mayaml v3
 
-=== 1.1.2 (2016.09.06)
+### 1.1.2 (2016.09.06)
 
 * fix typo in the account_init config file
 
-=== 1.1.1 (2016.09.06)
+### 1.1.1 (2016.09.06)
 
 * fix accounts default path in the account_init config file
 
-=== 1.1.0 (2016.09.06)
+### 1.1.0 (2016.09.06)
 
 * uses parameters: `realname` and `default` from mayaml v2
 
-=== 1.0.0 (2016.08.22)
+### 1.0.0 (2016.08.22)
 
 * publication of the code

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in mayaml.gemspec

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/mayaml-mutt.svg)](http://badge.fury.io/rb/mayaml-mutt)
 [![Code Climate](https://codeclimate.com/github/skopciewski/mayaml-mutt/badges/gpa.svg)](https://codeclimate.com/github/skopciewski/mayaml-mutt)
+[![Dependency Status](https://gemnasium.com/badges/github.com/skopciewski/mayaml-mutt.svg)](https://gemnasium.com/github.com/skopciewski/mayaml-mutt)
 
 This is the mutt configs generator which gets the accounts settigns from yaml file. See [Mayaml][mayaml_url]
 The mutt configuration is designed to handle many accounts and one inbox. (example implementation: [DockerMutt][docker_mutt_url])

data/bin/mayaml-mutt-creds

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2016, 2017 Szymon Kopciewski
 #
 # This file is part of MayamlMutt.
 #
@@ -53,10 +54,9 @@ def check_yaml_path(yaml_path)
     puts_ussage_message
     exit 1
   end
-  unless File.exist? yaml_path
-    puts "Could not find file: #{yaml_path}"
-    exit 1
-  end
+  return if File.exist? yaml_path
+  puts "Could not find file: #{yaml_path}"
+  exit 1
 end
 
 def main(args)

data/bin/mayaml-mutt-init

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2016, 2017 Szymon Kopciewski
 #
 # This file is part of MayamlMutt.
 #
@@ -52,10 +53,9 @@ def check_yaml_path(yaml_path)
     puts_ussage_message
     exit 1
   end
-  unless File.exist? yaml_path
-    puts "Could not find file: #{yaml_path}"
-    exit 1
-  end
+  return if File.exist? yaml_path
+  puts "Could not find file: #{yaml_path}"
+  exit 1
 end
 
 def main(args)

data/lib/mayaml-mutt/account_creds.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2016, 2017 Szymon Kopciewski
 #
 # This file is part of MayamlMutt.
 #
@@ -21,13 +21,9 @@ require "mustache"
 
 module MayamlMutt
   class AccountCreds
-    def initialize
-      @template = IO.read(File.join(File.dirname(__FILE__), "account_creds.mustache"))
-    end
-
     def render(mail_account)
       ::Mustache.render(
-        @template,
+        IO.read(template_file_path),
         name: mail_account.name,
         realname: mail_account.realname,
         user: mail_account.user,
@@ -35,8 +31,15 @@ module MayamlMutt
         server: mail_account.server,
         smtp_protocol: mail_account.smtp_protocol,
         smtp_port: mail_account.smtp_port,
-        smtp_authenticator: mail_account.smtp_authenticator
+        smtp_authenticator: mail_account.smtp_authenticator,
+        smtp_server: mail_account.smtp_server
       )
     end
+
+    private
+
+    def template_file_path
+      File.join(Gem.datadir("mayaml-mutt"), "account_creds.mustache")
+    end
   end
 end

data/lib/mayaml-mutt/account_init.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2016, 2017 Szymon Kopciewski
 #
 # This file is part of MayamlMutt.
 #
@@ -21,13 +21,9 @@ require "mustache"
 
 module MayamlMutt
   class AccountInit
-    def initialize
-      @template = IO.read(File.join(File.dirname(__FILE__), "account_init.mustache"))
-    end
-
     def render(mail_account, config = {})
       ::Mustache.render(
-        @template,
+        IO.read(template_file_path),
         name: mail_account.name,
         clean_name: clean_name(mail_account.name),
         accounts_dir: config.fetch(:accounts_dir, "~/.mutt/accounts")
@@ -36,6 +32,10 @@ module MayamlMutt
 
     private
 
+    def template_file_path
+      File.join(Gem.datadir("mayaml-mutt"), "account_init.mustache")
+    end
+
     def clean_name(string)
       string.gsub(/\W/, "_")
     end

data/lib/mayaml-mutt/accounts_alternates.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2016, 2017 Szymon Kopciewski
 #
 # This file is part of MayamlMutt.
 #
@@ -21,16 +21,18 @@ require "mustache"
 
 module MayamlMutt
   class AccountsAlternates
-    def initialize
-      @template = IO.read(File.join(File.dirname(__FILE__), "accounts_alternates.mustache"))
-    end
-
     def render(account_names)
       return "" if account_names.nil? || account_names.empty?
       ::Mustache.render(
-        @template,
+        IO.read(template_file_path),
         accounts: account_names.join(" ")
       )
     end
+
+    private
+
+    def template_file_path
+      File.join(Gem.datadir("mayaml-mutt"), "accounts_alternates.mustache")
+    end
   end
 end

data/lib/mayaml-mutt/configs_generator.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2016, 2017 Szymon Kopciewski
 #
 # This file is part of MayamlMutt.
 #

data/lib/mayaml-mutt/version.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2016, 2017 Szymon Kopciewski
 #
 # This file is part of MayamlMutt.
 #
@@ -18,5 +18,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module MayamlMutt
-  VERSION = "3.0.0".freeze
+  VERSION = "4.0.0"
 end

data/lib/mayaml-mutt.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2016, 2017 Szymon Kopciewski
 #
 # This file is part of MayamlMutt.
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mayaml-mutt
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Szymon Kopciewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mayaml
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -124,11 +138,8 @@ files:
 - bin/mayaml-mutt-creds
 - bin/mayaml-mutt-init
 - lib/mayaml-mutt.rb
-- lib/mayaml-mutt/account_creds.mustache
 - lib/mayaml-mutt/account_creds.rb
-- lib/mayaml-mutt/account_init.mustache
 - lib/mayaml-mutt/account_init.rb
-- lib/mayaml-mutt/accounts_alternates.mustache
 - lib/mayaml-mutt/accounts_alternates.rb
 - lib/mayaml-mutt/configs_generator.rb
 - lib/mayaml-mutt/version.rb

data/lib/mayaml-mutt/account_creds.mustache

@@ -1,8 +0,0 @@
-# vim: filetype=muttrc
-
-set realname="{{ realname }}"
-set from="{{ name }}"
-set smtp_url="{{ smtp_protocol }}://{{ user }}@{{ server }}:{{ smtp_port }}/" smtp_pass="{{ pass }}"
-set smtp_authenticators="{{ smtp_authenticator }}"
-set ssl_force_tls = yes
-set ssl_starttls = yes

data/lib/mayaml-mutt/account_init.mustache

@@ -1,3 +0,0 @@
-send-hook '~f ^{{ name }}' 'source {{ accounts_dir }}/{{ name }}'
-send2-hook '~f ^{{ name }}' 'source {{ accounts_dir }}/{{ name }}'
-alias my_account_{{ clean_name }} {{ name }}

data/lib/mayaml-mutt/accounts_alternates.mustache

@@ -1 +0,0 @@
-alternates {{ accounts }}