pinpress 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83ccc8144066f655e2b17a30f05ce1f9e0d3802a
-  data.tar.gz: bacd08125f3c4f14638598c40436605680966614
+  metadata.gz: abf02d81f7239b623f70a4f4e047a765fb6603f2
+  data.tar.gz: 7c79e907be640f042376328614bee97aac71e3fc
 SHA512:
-  metadata.gz: c0cad134fa4ee12431114767df32c935e2a936e642b1984d0d122201d8f9e2581346cdb6c7b18a50b846e4708e9f7fe4b2f8bd98135f0ab7bca59f045bc06802
-  data.tar.gz: 6551a7cb8d75cd7310110d1fe72c2a177c142a7bb01650c117f1e2483be6c25bd52ee25d4909b6effa3c83172ff65d9b35f210d9c79c1019ee06ed7beb9ec14d
+  metadata.gz: c14f1e6b344374440bb047e12e5f325da73f86fd7434c9e05c0bbd8b54d2bfa67f2aa82f873107ce224d0281b84712b29d68c4623685feb1a6b8e643a57fcd58
+  data.tar.gz: 3461ad458562a329b1234641d5b567c624367aacc704c7c13774f12aab85dcc930a337b2ed81cd545a213271c15ebfed029c19e035fa935e31c2e58d03d3a854

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.1
+  - 2.0.0
+  - 1.9.3

data/Gemfile

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

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 1.2.3 (2014-05-04)
+
+* Fixed a bug where error management failed
+* Updated documentation
+
 # 1.2.2 (2014-04-29)
 
 * Fixed a bug in which the configuration wouldn't update as expected
@@ -37,4 +42,4 @@
 
 # 1.0.0 (2014-04-16)
 
-* Initial release
+* Initial release

data/README.md

@@ -1,18 +1,26 @@
 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.
+PinPress is a simple CLI to create templates (HTML, Markdown, or otherwise) of
+Pinboard pins and tags.
 
 # Why?
 
-Every week, I create a [link mash for my blog](#link-mash-config-file); this link mash consists of URLs that I find interesting and want to share with my readers. Previously, I would save those interesting URLs to an Evernote note and, every week, manually create my link mash for use in Wordpress. `<barf/>`
+Every week, I create a [link mash for my blog](#link-mash-config-file); this
+link mash consists of URLs that I find interesting and want to share with my
+readers. Previously, I would save those interesting URLs to an Evernote note
+and, every week, manually create my link mash for use in Wordpress. `<barf/>`
 
-When I began using [Pinboard](http://pinboard.in "Pinboard") to save interesting links, I knew I needed a better method. This tool is the result: **Pin** board + Word **press**.
+When I began using [Pinboard](http://pinboard.in "Pinboard") to save
+interesting links, I knew I needed a better method. This tool is the result:
+**Pin** board + Word **press**.
 
 # Prerequisites
 
-In addition to Git (which, given you being on this site, I'll assume you have), Ruby (v. 1.9.3 or greater) is needed.
+In addition to Git (which, given you being on this site, I'll assume you have),
+Ruby (v. 1.9.3 or greater) is needed.
 
 # Installation
 
@@ -48,7 +56,8 @@ COMMANDS
     templates - Work with templates for pin output
 ```
 
-Note that each command's options can be revealed by adding the `--help` switch after the command. For example:
+Note that each command's options can be revealed by adding the `--help` switch
+after the command. For example:
 
 ```bash
 $ pinpress pins --help
@@ -71,7 +80,8 @@ COMMAND OPTIONS
 $ pinpress init
 ```
 
-Initialization will prompt you to enter your Pinboard API token. Once, entered, this (and other pertinent data) will be stored in `~/.pinpress`.
+Initialization will prompt you to enter your Pinboard API token. Once, entered,
+this (and other pertinent data) will be stored in `~/.pinpress`.
 
 # Getting Pins
 
@@ -79,9 +89,11 @@ Initialization will prompt you to enter your Pinboard API token. Once, entered,
 $ pinpress pins
 ```
 
-This simple command will return all pins from the user's account and output them based on the [Pin Template](#pin-templates "Pin Templates") provided.
+This simple command will return all pins from the user's account and output them
+based on the [Pin Template](#pin-templates "Pin Templates") provided.
 
-Pinpress also provides some flags that allow a user to define specific pins to grab:
+Pinpress also provides some flags that allow a user to define specific pins to
+grab:
 
 * `-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"))
@@ -126,7 +138,9 @@ $ pinpress pins -t "ruby,cli"
 $ pinpress pins last
 ```
 
-...will get all the pins created since you last ran that command (e.g., if you'd last run `pinpress pins` on 2014-01-01, this command would return all pins created from 2014-01-02 onward).
+...will get all the pins created since you last ran that command (e.g., if you'd
+last run `pinpress pins` on 2014-01-01, this command would return all pins
+created from 2014-01-02 onward).
 
 # Getting Tags
 
@@ -136,9 +150,11 @@ Pinpress can also work with tags in a Pinboard account:
 $ pinpress tags
 ```
 
-This simple command will return all tags from the user's account and output them based on the [Tag Template](#tag-templates "Tag Templates") provided.
+This simple command will return all tags from the user's account and output them
+based on the [Tag Template](#tag-templates "Tag Templates") provided.
 
-Pinpress also provides some flags that allow a user to define specific tags to grab:
+Pinpress also provides some flags that allow a user to define specific tags to
+grab:
 
 * `-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"))
@@ -150,7 +166,9 @@ Pinpress also provides some flags that allow a user to define specific tags to g
 $ pinpress tags -s 2014-01-01
 ```
 
-...returns all tags used from January 1, 2014 to the current day. Note that for each tag returned, the data includes both the tag name and the number of times it was used.
+...returns all tags used from January 1, 2014 to the current day. Note that for
+each tag returned, the data includes both the tag name and the number of times
+it was used.
 
 ## Getting Tags Until a Date
 
@@ -172,7 +190,8 @@ $ pinpress tags -s 2014-01-01 -e 2014-01-31
 $ 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.
+...returns all tags that have been used *alongside* `tag1` and `tag2`, starting
+on Jarnuary 1, 2014.
 
 ## Getting Tags Used Since Last Run
 
@@ -180,11 +199,15 @@ $ pinpress tags -t 'tag1,tag2' -s 2014-01-01
 $ pinpress tags last
 ```
 
-...will get all the tags used since you last ran the command (e.g., if you'd last run `pinpress tags` on 2014-01-01, this command would return all tags used from 2014-01-02 onward).
+...will get all the tags used since you last ran the command (e.g., if you'd
+last run `pinpress tags` on 2014-01-01, this command would return all tags used
+from 2014-01-02 onward).
 
 # Templates
 
-Templates are used to define how data should be output to the terminal and are defined in `~/.pinpress`. They come in two forms: **Pin Templates** and **Tag Templates**.
+Templates are used to define how data should be output to the terminal and are
+defined in `~/.pinpress`. They come in two forms: **Pin Templates** and **Tag
+Templates**.
 
 ## Pin Templates
 
@@ -192,7 +215,8 @@ Pin Templates define how a pin from Pinboard should be output.
 
 ### Schema
 
-Pin Templates are placed under the `pin_templates` section of the `~/.pinpress` config file -- as an example:
+Pin Templates are placed under the `pin_templates` section of the `~/.pinpress`
+config file -- as an example:
 
 ```yaml
 pin_templates:
@@ -216,7 +240,8 @@ A Pin Template can have several different sub-keys:
 
 ### Available Tokens
 
-Additionally, a Pin Template can make use of several different tokens that are filled by a pin's values:
+Additionally, a Pin Template can make use of several different tokens that are
+filled by a pin's values:
 
 * `<%= href %>`: the URL of the pin
 * `<%= description %>`: the description of the pin
@@ -284,7 +309,8 @@ $ pinpress pins pinpress_default
 </ul>
 ```
 
-(Note that the nice indenting is for Github's sake; the actual output will conform to the formatting in `~/.pinpress`.)
+(Note that the nice indenting is for Github's sake; the actual output will
+conform to the formatting in `~/.pinpress`.)
 
 ## Tag Templates
 
@@ -312,7 +338,8 @@ A Tag Template makes use of the same sub-keys as Pin Template:
 Additionally, like a Pin Template, a Tag Template can make use of a few tokens:
 
 * `<%= tag %>`: the name of the tag
-* `<%= count %>`: the number of times the tag has been used (depending on the range used)
+* `<%= count %>`: the number of times the tag has been used (depending on the
+range used)
 
 ### Usage
 
@@ -357,7 +384,8 @@ link-mash (15),app (2),ios (3),productivity (1),launch-center-pro (1),drafts (2)
 
 # Other Configuration Options
 
-You can place special keys in the `pinpress` section of `~/.pinpress` to automate some actions:
+You can place special keys in the `pinpress` section of `~/.pinpress` to
+automate some actions:
 
 ```yaml
 pinpress:
@@ -388,7 +416,8 @@ Do note:
 
 # Link Mash Config File
 
-For your reference, here's my `~/.pinpress` (which is used to generate a [Link Mash on my blog](http://www.bachyaproductions.com/tag/link-mash/ "Bachya Productions Link Mash Archives")):
+For your reference, here's my `~/.pinpress` (which is used to generate a
+[Link Mash on my blog](http://www.bachyaproductions.com/tag/link-mash/ "Bachya Productions Link Mash Archives")):
 
 ```yaml
 ---
@@ -400,7 +429,7 @@ pinpress:
   ignored_tags: ['buffer']
   log_level: WARN
   version: 1.1.1
-  api_token: bachya:b819312cf9ccee799b87
+  api_token: bachya:1234567890987654321
   last_pins_run: 2014-04-29
   last_tags_run: 2014-04-29
 pin_templates:
@@ -434,13 +463,16 @@ tag_templates:
 
 # Known Issues & Future Releases
 
-Check out the Pinpress roadmap via the [Trello Board](https://trello.com/b/lmuC8TT0/pinpress "Pinpress Trello Board").
+Check out the Pinpress roadmap via the
+[Trello Board](https://trello.com/b/lmuC8TT0/pinpress "Pinpress Trello Board").
 
-Bugs, issues, and enhancement requests can be submitted on the [Issues Page](https://github.com/bachya/Pinpress/issues "Open Items").
+Bugs, issues, and enhancement requests can be submitted on the
+[Issues Page](https://github.com/bachya/Pinpress/issues "Open Items").
 
 # Bugs and Feature Requests
 
-To report bugs with or suggest features/changes for PinPress, please use the [Issues Page](http://github.com/bachya/PinPress/issues).
+To report bugs with or suggest features/changes for PinPress, please use the
+[Issues Page](http://github.com/bachya/PinPress/issues).
 
 Contributions are welcome and encouraged. To contribute:
 
@@ -456,8 +488,20 @@ Contributions are welcome and encouraged. To contribute:
 
 Copyright © 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.
+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/Rakefile

@@ -53,4 +53,4 @@ task :build do
   FileUtils.mv("./pinpress-#{ version }.gem", "pkg")
 end
 
-task :default => [:features] #:yard, :test, :features
+task :default => [:yard, :test, :features]

data/bin/pinpress

@@ -67,7 +67,7 @@ pre do |global, command, options, args|
 
     # Compare the two versions and, if needed, update.
     configuration.compare_version do |c, l|
-      messenger.debug { "Upgrading from #{ c } to #{ l }" }
+      messenger.debug("Upgrading from #{ c } to #{ l }")
       PinPress.update_config_file
       exit!(0)
     end
@@ -85,9 +85,9 @@ post do |global, command, options, args|
 end
 
 on_error do |exception|
-  # messenger.error(exception.to_s)
-  # exit!(1)
-  # true
+  messenger.error(exception.to_s)
+  exit!(1)
+  true
 end
 
 # ======================================================

data/features/1.ui.feature

@@ -5,4 +5,4 @@ Feature: UI
 
   Scenario: Display help instructions
     When I get help for "pinpress"
-    Then the exit status should be 0
+    Then the exit status should be 0

data/features/2.initialization.feature

@@ -10,60 +10,36 @@ Feature: Initialization
       And I type ""
       And I type "bachya:12345"
     Then the exit status should be 0
-      And the following files should exist:
-      | /tmp/pp/.pinpress |
+      And a valid configuration file should exist at "/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.1
-       api_token: bachya:12345
-     """
-     When I run `pinpress init` interactively
-       And I type ""
-     Then the exit status should be 0
+    Given an existing current configuration file located at "/tmp/pp/.pinpress"
+    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:
-    """
-    ---
-    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
-    """
+    Given an existing current configuration file located at "/tmp/pp/.pinpress"
     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 following files should exist:
-      | /tmp/pp/.pinpress |
+      And a valid configuration file should exist at "/tmp/pp/.pinpress"
 
-  Scenario: Reinitialization (from scratch)
-    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.1
-      api_token: bachya:12345
-    """
+  Scenario: Reinitialization (accept)
+    Given an existing current configuration file located at "/tmp/pp/.pinpress"
     When I run `pinpress init -s` interactively
       And I type ""
       And I type "bachya:12345"
     Then the exit status should be 0
-      And the following files should exist:
-      | /tmp/pp/.pinpress |
+      And a valid configuration file should exist at "/tmp/pp/.pinpress"
+
+  Scenario: Update out-of-date configuration file
+    Given an existing old configuration file located at "/tmp/pp/.pinpress"
+    When I run `pinpress init` interactively
+      And I type ""
+      And I type ""
+      And I type "bachya:12345"
+    Then the exit status should be 0
+      And a valid configuration file should exist at "/tmp/pp/.pinpress"

data/features/3.templates.feature

@@ -4,47 +4,19 @@ Feature: Templates
   templates and choose one.
 
   Scenario: List Templates (implicit)
-    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.1
-      api_token: bachya:12345
-    pin_templates:
-    - name: pinpress_default
-    tag_templates:
-    - name: pinpress_default
-    """
+    Given an existing current configuration file located at "/tmp/pp/.pinpress"
     When I run `pinpress templates` interactively
     Then the exit status should be 0
-    And the output should contain:
-    """
-    ---> AVAILABLE PIN TEMPLATES:
-    # 1. pinpress_default
-    ---> AVAILABLE TAG TEMPLATES:
-    # 1. pinpress_default
-    """
+      And the output should contain:
+      """
+      ---> AVAILABLE PIN TEMPLATES:
+      # 1. pinpress_default
+      ---> AVAILABLE TAG TEMPLATES:
+      # 1. pinpress_default
+      """
 
   Scenario: List Templates (explicit)
-    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.1
-      api_token: bachya:12345
-    pin_templates:
-    - name: pinpress_default
-    tag_templates:
-    - name: pinpress_default
-    """
+    Given an existing current configuration file located at "/tmp/pp/.pinpress"
     When I run `pinpress templates list` interactively
     Then the exit status should be 0
       And the output should contain:

data/features/step_definitions/pinpress_steps.rb

@@ -1,12 +1,37 @@
+def create_config_file(version)
+  config = YAML.load_file(File.join(LIB_DIR, '..', 'support/sample_config.yaml'))
+  config['pinpress'].merge!('version' => version)
+  File.open('/tmp/pp/.pinpress', 'w') { |f| f.write(config.to_yaml) }
+end
+
+Given(/^no file located at "(.*?)"$/) do |filepath|
+  step %(the file "#{ filepath }" should not exist)
+end
+
+Given(/^an existing current configuration file located at "(.*?)"$/) do |filepath|
+  create_config_file(PinPress::VERSION)
+end
+
+Given(/^an existing old configuration file located at "(.*?)"$/) do |filepath|
+  create_config_file('0.0.1')
+end
+
 When /^I get help for "([^"]*)"$/ do |app_name|
   @app_name = app_name
   step %(I run `#{app_name} help`)
 end
 
-Given(/^no file located at "(.*?)"$/) do |filepath|
-  step %(the file "#{ filepath }" should not exist)
+Then(/^the following files should not be empty:$/) do |table|
+  table.cell_matrix.flatten.each do |file|
+    expect(File.file?(file.value)).to eq(true)
+    expect(File.read(file.value)).not_to be_empty
+  end
 end
 
-Given(/^a file located at "(.*?)" with the contents:$/) do |filepath, contents|
-  File.open(filepath, 'w') { |f| f.write(contents) }
-end
+Then(/^a valid configuration file should exist at "(.*?)"$/) do |filepath|
+  expect(File.file?(filepath)).to eq(true)
+  stub_data = YAML.load_file(File.join(LIB_DIR, '..', 'support/sample_config.yaml'))
+  config_data = YAML.load_file(filepath)
+  config_data['pinpress'].delete('version')
+  expect(config_data).to eq(stub_data)
+end

data/features/support/env.rb

@@ -1,12 +1,10 @@
-require 'simplecov'
 require 'aruba/cucumber'
-require 'cucumber/rspec/doubles'
+require_relative '../../lib/pinpress/constants'
 
 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')
 
 Before do
-  # Using "announce" causes massive warnings on 1.9.2
   @puts = true
   @original_rubylib = ENV['RUBYLIB']
   ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s

data/lib/pinpress.rb

@@ -116,10 +116,10 @@ module PinPress
           output += PinPress.generate_items(template_type, template, pins, opts)
           output += template.closer if template.closer
         end
+
         configuration.save
         return output
       rescue StandardError => e
-        p e.to_s
         messenger.debug(e.to_s)
         raise "Pinboard API failed; are you sure you've run " \
              " `pinpress init` (and that your API key is correct)?"
@@ -173,7 +173,7 @@ module PinPress
       default_pin_template = {
         name: 'pinpress_default',
         opener: '<ul>',
-        item: '<li><b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b><%= extended %></li>',
+        item: '<li><b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b> <%= extended %></li>',
         closer: '</ul>'
       }
 
@@ -190,9 +190,8 @@ module PinPress
     pm.ask
     configuration.ingest_prefs(pm)
 
-    messenger.debug {
-      "Configuration values after pref collection: #{ configuration.data }"
-    }
+    messenger.debug("Configuration values after pref collection: #{ configuration.data }")
+
     configuration.save
     @initialized = true
   end

data/lib/pinpress/constants.rb

@@ -20,7 +20,7 @@ module PinPress
       File.dirname(__FILE__),
       '..',
       '..',
-      'res/preference_prompts.yaml'
+      'support/preference_prompts.yaml'
     )
   }
 
@@ -28,5 +28,5 @@ module PinPress
   SUMMARY = 'A simple CLI to create HTML templates of Pinboard data.'
 
   # The Gem's version
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/pinpress.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.email            = ["bachya1208@googlemail.com"]
   spec.summary          = PinPress::SUMMARY
   spec.description      = PinPress::DESCRIPTION
-  spec.homepage         = 'http://www.bachyaproductions.com/pinpress-joining-pinboard-wordpress/'
+  spec.homepage         = 'https://github.com/bachya/pinpress'
   spec.license          = 'MIT'
 
   spec.files            = `git ls-files -z`.split("\x0")
@@ -17,11 +17,9 @@ Gem::Specification.new do |spec|
   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('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.1')
+  spec.add_runtime_dependency('cliutils', '~> 2')
   spec.add_runtime_dependency('gli', '2.9.0')
   spec.add_runtime_dependency('pinboard', '0.1.1')
 end
-

data/{test/test_files/configuration.yaml → support/sample_config.yaml}

@@ -1,17 +1,15 @@
 ---
 pinpress:
-  config_location: "/tmp/test.config"
+  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
 pin_templates:
 - name: pinpress_default
   opener: "<ul>"
-  item: "<li><b><a title=\"<%= description %>\" href=\"<%= href %>\" target=\"_blank\"><%=
-    description %></a>.</b> <%= extended %></li>"
+  item: <li><b><a title="<%= description %>" href="<%= href %>" target="_blank"><%= description %></a>.</b> <%= extended %></li>
   closer: "</ul>"
 tag_templates:
 - name: pinpress_default
-  item: "<%= tag %>,"
+  item: "<%= tag %> (<%= count %>),"

data/test/test_helper.rb

@@ -1,4 +1,3 @@
-require 'simplecov'
 require 'test/unit'
 
 class Test::Unit::TestCase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinpress
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -52,20 +52,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.1.1
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +133,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - HISTORY.md
 - LICENSE
@@ -156,7 +143,6 @@ files:
 - features/1.ui.feature
 - features/2.initialization.feature
 - features/3.templates.feature
-- features/4.pins.feature
 - features/step_definitions/pinpress_steps.rb
 - features/support/env.rb
 - lib/pinpress.rb
@@ -165,14 +151,13 @@ files:
 - lib/pinpress/templates/tag_template.rb
 - lib/pinpress/templates/template.rb
 - pinpress.gemspec
-- res/preference_prompts.yaml
-- res/sample_config.yaml
+- support/preference_prompts.yaml
+- support/sample_config.yaml
 - 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/
+homepage: https://github.com/bachya/pinpress
 licenses:
 - MIT
 metadata: {}
@@ -200,12 +185,10 @@ test_files:
 - features/1.ui.feature
 - features/2.initialization.feature
 - features/3.templates.feature
-- features/4.pins.feature
 - features/step_definitions/pinpress_steps.rb
 - features/support/env.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/features/4.pins.feature

@@ -1,19 +0,0 @@
-@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:
-    """
-    ---
-    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 pins` interactively
-    Then the exit status should be 1

data/res/sample_config.yaml

@@ -1,17 +0,0 @@
----
-pinpress:
-  config_location: "/Users/abach/.pinpress"
-  default_template: pinpress_default
-  log_level: WARN
-  version: 1.0.1
-  api_token: bachya:b819312cf9ccee799b87
-templates:
-- name: pinpress_default
-  opener: "<ul>"
-  item: "<li><b><a title=\"<%= description %>\" href=\"<%= href %>\" target=\"_blank\"><%=
-    description %></a>.</b> <%= extended %></li>"
-  closer: "</ul>"
-- name: secondary
-  opener: "<ul>"
-  item: "<li>TEST</li>"
-  closer: "</ul>"