pinpress 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 470b3cfe5ce7dcb5b42e75d3b25bc28e7e4ee1fb
-  data.tar.gz: db44436726bde6f1764066ad00cbe573af7bc49d
+  metadata.gz: d7185070529faee2eb5ebac9bfc6d005c4d113e0
+  data.tar.gz: 26790b6920af2b9902084df5c7dd6bd784011904
 SHA512:
-  metadata.gz: 064bebde43fe8a7f6f3f6ce06a27c5edcc044cf43d7656e7c9d3146e6520e45cd985d5767a23133d432aaa67673417c6ef146a64ead7c29c819633b927a59821
-  data.tar.gz: 1565d6c2de0d61e60229f466b42446e15fad10b5743151ba8417f827bfb56eec17db83bf01c04a79615725265df924f238e57253856b7047821dc5f21e3d3d20
+  metadata.gz: 8dadda3e5c48457e5c4dc5e64cc8919a8e6b98c23090ff71e7b526479d3e91dc3e507a4b51e44d49f04c451870e4c6ba56847ce5ac1fe0b7d9edc009578b19d5
+  data.tar.gz: 532c8aca16572c57625febb2b2ec00fb7be283a2ab88f7f4bfb188bb3cf80c3f2f201dc645dab500525e6b399d5ea077a5eb65bce426076678df3baafea45580

data/.gitignore

@@ -2,6 +2,8 @@
 doc
 pkg
 .yardoc
-bin
 .tmp
 results.html
+Gemfile.lock
+.simplecov
+coverage

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
+gem 'simplecov', :require => false, :group => :test
+
 gemspec

data/README.md

@@ -1,6 +1,5 @@
 PinPress
 ========
-[![Build Status](https://travis-ci.org/bachya/PinPress.svg?branch=master)](https://travis-ci.org/bachya/PinPress)
 [![Gem Version](https://badge.fury.io/rb/pinpress.svg)](http://badge.fury.io/rb/pinpress)
 
 PinPress is a simple CLI to create templates (HTML, Markdown, or otherwise) of Pinboard pins and tags.
@@ -28,14 +27,14 @@ Syntax and usage can be accessed by running `pinpress help`:
 ```
 $ pinpress help
 NAME
-    pinpress - A Pinboard application that allows for the creation of 
+    pinpress - A Pinboard application that allows for the creation of
     "pin templates" in almost any conceivable format.
 
 SYNOPSIS
     pinpress [global options] command [command options] [arguments...]
 
 VERSION
-    1.1.1
+    1.1.2
 
 GLOBAL OPTIONS
     --help    - Show this message
@@ -76,7 +75,7 @@ Initialization will prompt you to enter your Pinboard API token. Once, entered,
 
 # Templates
 
-The first stop on the PinPress journey is templates. Templates are used to define how data should be output and are defined in `~/.pinpress`. They come in two forms: **Pin Templates** and **Tag Templates**. 
+The first stop on the PinPress journey is templates. Templates are used to define how data should be output and are defined in `~/.pinpress`. They come in two forms: **Pin Templates** and **Tag Templates**.
 
 ## Pin Templates
 
@@ -223,7 +222,7 @@ Pinpress also provides some flags that allow a user to define specific pins to g
 * `-s`: the start date to use (uses [Chronic](https://github.com/mojombo/chronic "Chronic"), which allows dates like "last Tuesday")
 * `-e`: the end date to use (also uses [Chronic](https://github.com/mojombo/chronic "Chronic"))
 * `-n`: the number of pins to return (e.g., 20)
-* `-t`: a CSV list of tags to grab (e.g., "tag1,tag2")
+* `-t`: a CSV list of tags (e.g., "tag1,tag2") that must exist for the returned pins
 
 Naturally, these switches can be combined in any number of ways.
 
@@ -272,6 +271,7 @@ Pinpress also provides some flags that allow a user to define specific tags to g
 
 * `-s`: the start date to use (uses [Chronic](https://github.com/mojombo/chronic "Chronic"), which allows dates like "last Tuesday")
 * `-e`: the end date to use (also uses [Chronic](https://github.com/mojombo/chronic "Chronic"))
+* `-t`: a CSV list of tags (e.g., "tag1,tag2") to examine for association (see [below](#getting-tags-that-have-been-used-with-other-tags)).
 
 ## Getting Tags From a Date Forward
 
@@ -295,11 +295,19 @@ $ pinpress tags -e 2014-01-01
 $ pinpress tags -s 2014-01-01 -e 2014-01-31
 ```
 
+## Getting Tags that Have Been Used With Other Tags
+
+```
+$ pinpress tags -t 'tag1,tag2' -s 2014-01-01
+```
+
+...returns all tags that have been used *alongside* `tag1` and `tag2`, starting on Jarnuary 1, 2014.
+
 # Other Configuration Options
 
 In addition to `default_pin_template` and `default_tag_template`, you can place some other special keys in the `pinpress` section of `~/.pinpress`:
 
-* `default_tags`: the default tags to be used when getting pins (e.g., `'ruby,pinboard'`). This can be overridden by using the `-t` flag.
+* `default_tags`: the default tags (e.g., `'ruby,pinboard'`) to be used when getting pins or associated tags. This can be overridden by using the `-t` flag.
 * `default_num_results`: the default number of results to return (e.g., '5'). This can be overridden by using the `-n` flag.
 
 # Known Issues & Future Releases
@@ -330,4 +338,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 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.
+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/Rakefile

@@ -22,18 +22,23 @@ CLEAN << CUKE_RESULTS
 desc 'Run Cucumber features'
 Cucumber::Rake::Task.new(:features) do |t|
   opts = "features --format html -o #{CUKE_RESULTS} --format progress -x"
-  opts += " --tags #{ENV['TAGS']}" if ENV['TAGS']
-  t.cucumber_opts =  opts
+  opts += " --tags @active"
+  t.cucumber_opts = opts
   t.fork = false
 end
 
+require 'yard'
+desc 'Create YARD documentation'
+YARD::Rake::YardocTask.new do |t|
+end
+
 desc "Release PinPress version #{ version }"
 task :release => :build do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
     exit!
   end
-  
+
   sh "git commit --allow-empty -a -m 'Release #{ version }'"
   sh "git tag v#{ version }"
   sh "git push origin master"
@@ -48,4 +53,4 @@ task :build do
   FileUtils.mv("./pinpress-#{ version }.gem", "pkg")
 end
 
-task :default => [:test, :features]
+task :default => [:features] #:yard, :test, :features

data/bin/pinpress

@@ -0,0 +1,258 @@
+#!/usr/bin/env ruby
+# Encoding: utf-8
+#--------------------------------------------------------------------
+# PinPress
+#
+# A Pinboard application that allows for the creation of
+# "pin templates" in almost any conceivable format.
+#
+# Copyright (c) 2014
+# Aaron Bach <bachya1208@gmail.com>
+#
+# 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.
+#--------------------------------------------------------------------
+require 'chronic'
+require 'cliutils'
+require 'gli'
+require 'pinboard'
+require 'pinpress'
+
+include CLIUtils::Configuration
+include CLIUtils::Messaging
+include GLI::App
+
+# ======================================================
+# App Info
+# ======================================================
+program_desc PinPress::DESCRIPTION
+version PinPress::VERSION
+
+# ======================================================
+# Global Flags and Switches
+# ======================================================
+
+# ======================================================
+# Pre, Post, and Error
+# ======================================================
+pre do |global, command, options, args|
+  # Load PinPress configuration module.
+  load_configuration(PinPress::CONFIG_FILEPATH)
+  file_logger = Logger.new(PinPress::LOG_FILEPATH)
+  file_logger.level = LOG_LEVELS[configuration.pinpress[:log_level] || 'DEBUG']
+  messenger.attach(LOGFILE: file_logger)
+
+  if File.exist?(PinPress::CONFIG_FILEPATH)
+    # Set the current and last config versions in the Configurator.
+    configuration.current_version = configuration.pinpress[:version]
+    configuration.last_version = PinPress::NEWEST_CONFIG_VERSION
+
+    # Compare the two versions and, if needed, update.
+    configuration.compare_version do |c, l|
+      messenger.debug { "Upgrading from #{ c } to #{ l }" }
+      PinPress.update_config_file
+      exit!(0)
+    end
+  else
+    # Force the user to init if they try to run any command
+    # other than `init` first.
+    PinPress.init(true)
+    exit!(0)
+  end
+  true
+end
+
+post do |global, command, options, args|
+
+end
+
+on_error do |exception|
+  messenger.error(exception.to_s)
+  exit!(1)
+  true
+end
+
+# ======================================================
+# Commands
+# ======================================================
+# ------------------------------------------------------
+# init command
+#
+# Initializes the app by asking the user for information
+# needed to run.
+# ------------------------------------------------------
+desc 'Install and initialize dependencies'
+command :init do |c|
+  c.switch([:s], desc: 'Run init from scratch')
+  c.action do |global_options, options, args|
+    if options[:s]
+      PinPress.init(true)
+    else
+      long_message = "You've already initialized PinPress. Do it again?"
+      PinPress.init if messenger.prompt(long_message, 'N').downcase == 'y'
+    end
+  end
+end
+
+# ------------------------------------------------------
+# pins command
+#
+# Gets pins from Pinboard.
+# ------------------------------------------------------
+desc 'Get pins from Pinboard'
+command :pins do |c|
+  c.flag([:e], desc: 'The end date to pull pins to')
+  c.flag([:n], desc: 'The number of results to return')
+  c.flag([:s], desc: 'The start date to pull pins from')
+  c.flag([:t], desc: 'The tags to use (e.g., "ruby,pinboard")')
+
+  c.action do |global_options, options, args|
+    # Two scenarios covered here:
+    #   1. If the user passes a valid name, grab that template.
+    #   2. If no name is passed, grabbed the default template
+    # If both of these conditions fail, an error message is shown.
+    t_type = PinPress::Template::TEMPLATE_TYPE_PIN
+    t_name = args.empty? ? nil : args[0]
+
+    PinPress.execute_template(t_type, t_name) do |template, client|
+      # Create a Pinboard client and set options based on
+      # PinPress flags.
+      opts = {}
+      opts.merge!(todt: Chronic.parse(options[:e])) if options[:e]
+      opts.merge!(fromdt: Chronic.parse(options[:s])) if options[:s]
+
+      if options[:n]
+        opts.merge!(results: options[:n])
+      elsif configuration.pinpress[:default_num_results]
+        opts.merge!(results: configuration.pinpress[:default_num_results])
+      end
+
+      if options[:t]
+        opts.merge!(tag: options[:t])
+      elsif configuration.pinpress[:default_tags]
+        opts.merge!(tag: configuration.pinpress[:default_tags])
+      end
+
+      begin
+        pins = client.posts(opts)
+        if !pins.empty?
+          print template.opener if template.opener
+          pins.each do |p|
+            href        = p[:href]
+            description = p[:description]
+            extended    = p[:extended]
+            tag         = p[:tag]
+            time        = p[:time]
+            replace     = p[:replace]
+            shared      = p[:shared]
+            toread      = p[:toread]
+
+            print ERB.new(template.item).result(binding) if template.item
+          end
+          print template.closer if template.closer
+        else
+          messenger.warn('No matching pins...')
+        end
+      rescue StandardError => e
+        messenger.debug(e.to_s)
+        raise "Pinboard API failed; are you sure you've run " \
+             " `pinpress init` (and that your API key is correct)?"
+      end
+    end
+  end
+end
+
+# ------------------------------------------------------
+# tags command
+#
+# Gets pins from Pinboard.
+# ------------------------------------------------------
+desc 'Get tags from Pinboard'
+command :tags do |c|
+  c.flag([:e], desc: 'The end date to pull pins to')
+  c.flag([:t], desc: 'The tags to use (e.g., "ruby,pinboard")')
+  c.flag([:s], desc: 'The start date to pull pins from')
+
+  c.desc 'Gets the unique tags based on the passed criteria'
+  c.action do |global_options, options, args|
+    t_type = PinPress::Template::TEMPLATE_TYPE_TAG
+    t_name = args.empty? ? nil : args[0]
+
+    PinPress.execute_template(t_type, t_name) do |template, client|
+      tags = []
+      opts = {}
+      opts.merge!(todt: Chronic.parse(options[:e])) if options[:e]
+      opts.merge!(fromdt: Chronic.parse(options[:s])) if options[:s]
+
+      if options[:t]
+        opts.merge!(tag: options[:t])
+      elsif configuration.pinpress[:default_tags]
+        opts.merge!(tag: configuration.pinpress[:default_tags])
+      end
+
+      begin
+        pins = client.posts(opts)
+        pins.each { |p| tags += p[:tag] }
+        tags = tags.uniq.map { |t| { tag: t, count: tags.count(t) } }
+
+        if !tags.empty?
+          print template.opener if template.opener
+          tags.each do |t|
+            unless t[:tag] == opts[:tag]
+              tag   = t[:tag]
+              count = t[:count]
+            end
+
+            print ERB.new(template.item).result(binding) if template.item
+          end
+       print template.closer if template.closer
+        else
+          message.warn('No matching tags...')
+        end
+      rescue StandardError => e
+        messenger.debug(e.to_s)
+        raise "Pinboard API failed; are you sure you've run " \
+             " `pinpress init` (and that your API key is correct)?"
+      end
+    end
+  end
+end
+
+# ------------------------------------------------------
+# templates command
+#
+# Manages pin templates.
+# ------------------------------------------------------
+desc 'Work with templates for pin output'
+command :templates do |c|
+  c.desc 'List current templates'
+  c.command :list do |list|
+    list.action do |global_options, options, args|
+      PinPress.list_templates
+    end
+  end
+  c.default_command :list
+end
+
+# ======================================================
+# Run!
+# ======================================================
+exit run(ARGV)

data/features/1.ui.feature

@@ -1,3 +1,4 @@
+@active
 Feature: UI
   As a user, when I ask for help, I should be presented
   with instructions on how to run the app.

data/features/2.initialization.feature

@@ -1,3 +1,4 @@
+@active
 Feature: Initialization
   As a user, when I initialize PinPress,
   I should be guided through the process as
@@ -9,60 +10,25 @@ Feature: Initialization
       And I type ""
       And I type "bachya:12345"
     Then the exit status should be 0
-      And the file "/tmp/pp/.pinpress" should contain:
-      """
-      ---
-      pinpress:
-        config_location: "/tmp/pp/.pinpress"
-        default_pin_template: pinpress_default
-        default_tag_template: pinpress_default
-        log_level: WARN
-        version: 1.1.0
-        api_token: bachya:12345
-      pin_templates:
-      - name: pinpress_default
-        opener: |
-          <ul>
-        item: |
-          <li>
-          <b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b>
-          <%= extended %>
-          </li>
-        closer: "</ul>"
-      tag_templates:
-      - name: pinpress_default
-        item: "<%= tag %> (<%= count %>),"
-      """
+      And the following files should exist:
+      | /tmp/pp/.pinpress |
 
   Scenario: Reinitialization (refuse)
     Given a file located at "/tmp/pp/.pinpress" with the contents:
-    """
-    ---
-    pinpress:
-      config_location: "/tmp/pp/.pinpress"
-      default_pin_template: pinpress_default
-      default_tag_template: pinpress_default
-      log_level: WARN
-      version: 1.1.0
-      api_token: bachya:12345
-    pin_templates:
-    - name: pinpress_default
-      opener: |
-        <ul>
-      item: |
-        <li>
-        <b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b>
-        <%= extended %>
-        </li>
-      closer: "</ul>"
-    tag_templates:
-    - name: pinpress_default
-      item: "<%= tag %> (<%= count %>),"
-    """
-    When I run `pinpress init` interactively
-      And I type ""
-    Then the exit status should be 0
-    
+     """
+     ---
+     pinpress:
+       config_location: "/tmp/pp/.pinpress"
+       default_pin_template: pinpress_default
+       default_tag_template: pinpress_default
+       log_level: WARN
+       version: 1.1.1
+       api_token: bachya:12345
+     """
+     When I run `pinpress init` interactively
+       And I type ""
+     Then the exit status should be 0
+
   Scenario: Reinitialization (accept)
     Given a file located at "/tmp/pp/.pinpress" with the contents:
     """
@@ -72,52 +38,17 @@ Feature: Initialization
       default_pin_template: pinpress_default
       default_tag_template: pinpress_default
       log_level: WARN
-      version: 1.1.0
+      version: 1.1.1
       api_token: bachya:12345
-    pin_templates:
-    - name: pinpress_default
-      opener: |
-        <ul>
-      item: |
-        <li>
-        <b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b>
-        <%= extended %>
-        </li>
-      closer: "</ul>"
-    tag_templates:
-    - name: pinpress_default
-      item: "<%= tag %> (<%= count %>),"
     """
     When I run `pinpress init` interactively
       And I type "y"
       And I type ""
       And I type "bachya:12345"
     Then the exit status should be 0
-      And the file "/tmp/pp/.pinpress" should contain:
-      """
-      ---
-      pinpress:
-        config_location: "/tmp/pp/.pinpress"
-        default_pin_template: pinpress_default
-        default_tag_template: pinpress_default
-        log_level: WARN
-        version: 1.1.0
-        api_token: bachya:12345
-      pin_templates:
-      - name: pinpress_default
-        opener: |
-          <ul>
-        item: |
-          <li>
-          <b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b>
-          <%= extended %>
-          </li>
-        closer: "</ul>"
-      tag_templates:
-      - name: pinpress_default
-        item: "<%= tag %> (<%= count %>),"
-      """
-        
+      And the following files should exist:
+      | /tmp/pp/.pinpress |
+
   Scenario: Reinitialization (from scratch)
     Given a file located at "/tmp/pp/.pinpress" with the contents:
     """
@@ -127,47 +58,12 @@ Feature: Initialization
       default_pin_template: pinpress_default
       default_tag_template: pinpress_default
       log_level: WARN
-      version: 1.1.0
+      version: 1.1.1
       api_token: bachya:12345
-    pin_templates:
-    - name: pinpress_default
-      opener: |
-        <ul>
-      item: |
-        <li>
-        <b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b>
-        <%= extended %>
-        </li>
-      closer: "</ul>"
-    tag_templates:
-    - name: pinpress_default
-      item: "<%= tag %> (<%= count %>),"
     """
     When I run `pinpress init -s` interactively
       And I type ""
       And I type "bachya:12345"
     Then the exit status should be 0
-      And the file "/tmp/pp/.pinpress" should contain:
-      """
-      ---
-      pinpress:
-        config_location: "/tmp/pp/.pinpress"
-        default_pin_template: pinpress_default
-        default_tag_template: pinpress_default
-        log_level: WARN
-        version: 1.1.0
-        api_token: bachya:12345
-      pin_templates:
-      - name: pinpress_default
-        opener: |
-          <ul>
-        item: |
-          <li>
-          <b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b>
-          <%= extended %>
-          </li>
-        closer: "</ul>"
-      tag_templates:
-      - name: pinpress_default
-        item: "<%= tag %> (<%= count %>),"
-      """
+      And the following files should exist:
+      | /tmp/pp/.pinpress |

data/features/3.templates.feature

@@ -1,7 +1,8 @@
+@active
 Feature: Templates
   As a user, I should be able to list available
   templates and choose one.
-  
+
   Scenario: List Templates (implicit)
     Given a file located at "/tmp/pp/.pinpress" with the contents:
     """
@@ -11,21 +12,12 @@ Feature: Templates
       default_pin_template: pinpress_default
       default_tag_template: pinpress_default
       log_level: WARN
-      version: 1.1.0
+      version: 1.1.1
       api_token: bachya:12345
     pin_templates:
     - name: pinpress_default
-      opener: |
-        <ul>
-      item: |
-        <li>
-        <b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b>
-        <%= extended %>
-        </li>
-      closer: "</ul>"
     tag_templates:
     - name: pinpress_default
-      item: "<%= tag %> (<%= count %>),"
     """
     When I run `pinpress templates` interactively
     Then the exit status should be 0
@@ -36,7 +28,7 @@ Feature: Templates
     ---> AVAILABLE TAG TEMPLATES:
     # 1. pinpress_default
     """
-    
+
   Scenario: List Templates (explicit)
     Given a file located at "/tmp/pp/.pinpress" with the contents:
     """
@@ -46,21 +38,12 @@ Feature: Templates
       default_pin_template: pinpress_default
       default_tag_template: pinpress_default
       log_level: WARN
-      version: 1.1.0
+      version: 1.1.1
       api_token: bachya:12345
     pin_templates:
     - name: pinpress_default
-      opener: |
-        <ul>
-      item: |
-        <li>
-        <b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b>
-        <%= extended %>
-        </li>
-      closer: "</ul>"
     tag_templates:
     - name: pinpress_default
-      item: "<%= tag %> (<%= count %>),"
     """
     When I run `pinpress templates list` interactively
     Then the exit status should be 0

data/features/4.pins.feature

@@ -1,7 +1,8 @@
+@active
 Feature: Templates
   As a user, I should be able get pins from Pinboard
   and have them inherit certain templates.
-  
+
   Scenario: Invalid API Key
     Given a file located at "/tmp/pp/.pinpress" with the contents:
     """
@@ -11,21 +12,8 @@ Feature: Templates
       default_pin_template: pinpress_default
       default_tag_template: pinpress_default
       log_level: WARN
-      version: 1.1.0
+      version: 1.1.1
       api_token: bachya:12345
-    pin_templates:
-    - name: pinpress_default
-      opener: |
-        <ul>
-      item: |
-        <li>
-        <b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b>
-        <%= extended %>
-        </li>
-      closer: "</ul>"
-    tag_templates:
-    - name: pinpress_default
-      item: "<%= tag %> (<%= count %>),"
     """
     When I run `pinpress pins` interactively
     Then the exit status should be 1

data/features/support/env.rb

@@ -1,4 +1,6 @@
+require 'simplecov'
 require 'aruba/cucumber'
+require 'cucumber/rspec/doubles'
 
 ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')

data/lib/pinpress.rb

@@ -16,6 +16,12 @@ module PinPress
     attr_accessor :verbose
   end
 
+  # Establishes the template to use and yields a block with that
+  # template an a Pinboard client.
+  # @param [Fixnum] template_type Either a Pin or Tag template
+  # @param [String] template_name The neame of the template to use
+  # @yield
+  # @return [void]
   def self.execute_template(template_type, template_name)
     template_hash = PinPress.get_template_by_name(template_type, template_name)
     if !template_hash.nil?
@@ -62,13 +68,18 @@ module PinPress
       configuration.add_section(:pin_templates)
       configuration.add_section(:tag_templates)
 
+      configuration.pinpress.merge!(
+        config_location: configuration.config_path,
+        default_pin_template: 'pinpress_default',
+        default_tag_template: 'pinpress_default',
+        log_level: 'WARN',
+        version: PinPress::VERSION
+      )
+
       default_pin_template = {
         name: 'pinpress_default',
-        opener: "<ul>\n",
-        item: %q(<li>
-<b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b>
-<%= extended %>
-</li>) + "\n",
+        opener: '<ul>',
+        item: '<li><b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b><%= extended %></li>',
         closer: '</ul>'
       }
 
@@ -79,14 +90,6 @@ module PinPress
 
       configuration.data['pin_templates'] = [default_pin_template]
       configuration.data['tag_templates'] = [default_tag_template]
-
-      configuration.pinpress.merge!(
-        config_location: configuration.config_path,
-        default_pin_template: 'pinpress_default',
-        default_tag_template: 'pinpress_default',
-        log_level: 'WARN',
-        version: PinPress::VERSION
-      )
     end
 
     pm = CLIUtils::Prefs.new(PinPress::PREF_FILES['INIT'], configuration)

data/lib/pinpress/constants.rb

@@ -28,5 +28,5 @@ module PinPress
   SUMMARY = 'A simple CLI to create HTML templates of Pinboard data.'
 
   # The Gem's version
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/lib/pinpress/templates/pin_template.rb

@@ -3,5 +3,11 @@ module PinPress
   # currently empty, allows for future
   # flexibility.
   class PinTemplate < Template
+    # Initializes a new Pin Template.
+    # @param [Hash] params
+    # @return [void]
+    def initialize(params = {})
+      super(params)
+    end
   end
 end

data/lib/pinpress/templates/tag_template.rb

@@ -3,5 +3,11 @@ module PinPress
   # currently empty, allows for future
   # flexibility.
   class TagTemplate < Template
+    # Initializes a new Tag Template.
+    # @param [Hash] params
+    # @return [void]
+    def initialize(params = {})
+      super(params)
+    end
   end
 end

data/lib/pinpress/templates/template.rb

@@ -32,7 +32,7 @@ module PinPress
 
     # Initializes this class by ingesting
     # passed parameters.
-    # @param [Hash]
+    # @param [Hash] params
     # @return [void]
     def initialize(params = {})
       params.each { |key, value| send("#{ key }=", value) }

data/pinpress.gemspec

@@ -14,12 +14,14 @@ Gem::Specification.new do |spec|
   spec.test_files       = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths    = ["lib"]
 
+  spec.add_development_dependency('aruba', '0.5.4')
   spec.add_development_dependency('rake', '10.1.1')
   spec.add_development_dependency('rdoc', '4.1.1')
-  spec.add_development_dependency('aruba', '0.5.4')
+  spec.add_development_dependency('rspec', '2.14.1')
+  spec.add_development_dependency('yard', '0.8.7.4')
   spec.add_runtime_dependency('chronic', '0.10.2')
-  spec.add_runtime_dependency('cliutils', '~> 2.0')
-  spec.add_runtime_dependency('gli','2.9.0')
+  spec.add_runtime_dependency('cliutils', '~> 2.1')
+  spec.add_runtime_dependency('gli', '2.9.0')
   spec.add_runtime_dependency('pinboard', '0.1.1')
 end
 

data/test/pin_template_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+require File.join(File.dirname(__FILE__), '..', 'lib/pinpress/templates/template')
+require File.join(File.dirname(__FILE__), '..', 'lib/pinpress/templates/pin_template')
+
+class TestPinTemplate < Test::Unit::TestCase
+  def test_initialization
+    parameters = {
+      closer: '</ul>',
+      item: '<li></li>',
+      name: 'default',
+      opener: '</ul>',
+    }
+
+    t = PinPress::PinTemplate.new(parameters)
+    assert_equal(t.closer, parameters[:closer])
+    assert_equal(t.item, parameters[:item])
+    assert_equal(t.name, parameters[:name])
+    assert_equal(t.opener, parameters[:opener])
+  end
+end

data/test/pinpress_template_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+require File.join(File.dirname(__FILE__), '..', 'lib/pinpress/templates/template')
+
+class TestPinPressTemplate < Test::Unit::TestCase
+  def test_initialization
+    parameters = {
+      closer: '</ul>',
+      item: '<li></li>',
+      name: 'default',
+      opener: '</ul>',
+    }
+
+    t = PinPress::Template.new(parameters)
+    assert_equal(t.closer, parameters[:closer])
+    assert_equal(t.item, parameters[:item])
+    assert_equal(t.name, parameters[:name])
+    assert_equal(t.opener, parameters[:opener])
+  end
+end

data/test/tag_template_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+require File.join(File.dirname(__FILE__), '..', 'lib/pinpress/templates/template')
+require File.join(File.dirname(__FILE__), '..', 'lib/pinpress/templates/tag_template')
+
+class TestTagTemplate < Test::Unit::TestCase
+  def test_initialization
+    parameters = {
+      closer: '</ul>',
+      item: '<li></li>',
+      name: 'default',
+      opener: '</ul>',
+    }
+
+    t = PinPress::TagTemplate.new(parameters)
+    assert_equal(t.closer, parameters[:closer])
+    assert_equal(t.item, parameters[:item])
+    assert_equal(t.name, parameters[:name])
+    assert_equal(t.opener, parameters[:opener])
+  end
+end

data/test/test_files/configuration.yaml

@@ -0,0 +1,17 @@
+---
+pinpress:
+  config_location: "/tmp/test.config"
+  default_pin_template: pinpress_default
+  default_tag_template: pinpress_default
+  log_level: WARN
+  version: 1.1.1
+  api_token: bachya:12345
+pin_templates:
+- name: pinpress_default
+  opener: "<ul>"
+  item: "<li><b><a title=\"<%= description %>\" href=\"<%= href %>\" target=\"_blank\"><%=
+    description %></a>.</b> <%= extended %></li>"
+  closer: "</ul>"
+tag_templates:
+- name: pinpress_default
+  item: "<%= tag %>,"

data/test/test_helper.rb

@@ -1,9 +1,6 @@
+require 'simplecov'
 require 'test/unit'
 
-# Add test libraries you want to use here, e.g. mocha
-
 class Test::Unit::TestCase
 
-  # Add global extensions to the test case class here
-  
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pinpress
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.1.1
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7.4
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -114,19 +142,17 @@ description: |-
 email:
 - bachya1208@googlemail.com
 executables:
-- PinPress
+- pinpress
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - HISTORY.md
 - LICENSE
 - README.md
 - Rakefile
-- bin/PinPress
+- bin/pinpress
 - features/1.ui.feature
 - features/2.initialization.feature
 - features/3.templates.feature
@@ -141,7 +167,10 @@ files:
 - pinpress.gemspec
 - res/preference_prompts.yaml
 - res/sample_config.yaml
-- test/default_test.rb
+- test/pin_template_test.rb
+- test/pinpress_template_test.rb
+- test/tag_template_test.rb
+- test/test_files/configuration.yaml
 - test/test_helper.rb
 homepage: http://www.bachyaproductions.com/pinpress-joining-pinboard-wordpress/
 licenses:
@@ -174,5 +203,9 @@ test_files:
 - features/4.pins.feature
 - features/step_definitions/pinpress_steps.rb
 - features/support/env.rb
-- test/default_test.rb
+- test/pin_template_test.rb
+- test/pinpress_template_test.rb
+- test/tag_template_test.rb
+- test/test_files/configuration.yaml
 - test/test_helper.rb
+has_rdoc: 

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
-  - jruby-19mode

data/Gemfile.lock

@@ -1,55 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pinpress (1.1.1)
-      chronic (= 0.10.2)
-      cliutils (~> 2.0)
-      gli (= 2.9.0)
-      pinboard (= 0.1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    aruba (0.5.4)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    builder (3.2.2)
-    childprocess (0.5.2)
-      ffi (~> 1.0, >= 1.0.11)
-    chronic (0.10.2)
-    cliutils (2.0.2)
-    cucumber (1.3.14)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
-    diff-lcs (1.2.5)
-    ffi (1.9.3)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    gli (2.9.0)
-    httparty (0.11.0)
-      multi_json (~> 1.0)
-      multi_xml (>= 0.5.2)
-    json (1.8.1)
-    multi_json (1.9.2)
-    multi_test (0.1.1)
-    multi_xml (0.5.5)
-    pinboard (0.1.1)
-      httparty (= 0.11.0)
-    rake (10.1.1)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba (= 0.5.4)
-  pinpress!
-  rake (= 10.1.1)
-  rdoc (= 4.1.1)

data/test/default_test.rb

@@ -1,14 +0,0 @@
-require 'test_helper'
-
-class DefaultTest < Test::Unit::TestCase
-
-  def setup
-  end
-
-  def teardown
-  end
-
-  def test_the_truth
-    assert true
-  end
-end