pinpress 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfc060b12d9b6e434b9d53c0b0f5c23983c9eb22
-  data.tar.gz: 613901577d6178ba75f4457a948ca0577a41f1ea
+  metadata.gz: 9ae77f99f46a0971c0032f10131cbb16cc3c0ae7
+  data.tar.gz: 8eddc0dc1ded71589b348fb1605deca5f2b3b00f
 SHA512:
-  metadata.gz: f31b07c49c017d7b936d8124ec5229b8277a1bf5d8fa7c01587d392e34c484700aa35b8ac35d0c9e152e064670ac85726110b384b4859dc875020b7dc91212a8
-  data.tar.gz: aa7889fc1b6403f315db8df1a6ccd276262781116fb3afdd406fcdc1f77a503a8c370380363f42dcf864e2c54a2aa5440060df2d233b349ad02d61ae47fd9129
+  metadata.gz: 01127ec83ecfc6f1b72046c5d77ffa8594732d482650a80a89f1ed203fadfe05cba86f4fd2690baae900e808322a0599c0091b47fa93487969fcc583ef765ea6
+  data.tar.gz: aa9c8f7a7bd32b6dfa127165c6b62adc2370e2ec5ce92f88ff92228c289e38d2df3d39cebe0cbb4f350ed93186762af4dd5f45a188cf18a815b998b6426501d8

data/HISTORY.md

@@ -1,3 +1,9 @@
+# 1.2.1 (2014-04-29)
+
+* Added `pinpress pins last` functionality
+* Refactored pin-getting code to common place
+* More documentation
+
 # 1.2.0 (2014-04-29)
 
 * Added `ignored_tags` configuration key

data/README.md

@@ -6,7 +6,7 @@ PinPress is a simple CLI to create templates (HTML, Markdown, or otherwise) of P
 
 # Why?
 
-Every two weeks, I create a "link mash" for my website; 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 two weeks, 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**.
 
@@ -16,7 +16,7 @@ In addition to Git (which, given you being on this site, I'll assume you have),
 
 # Installation
 
-```
+```bash
 gem install pinpress
 ```
 
@@ -24,7 +24,7 @@ gem install pinpress
 
 Syntax and usage can be accessed by running `pinpress help`:
 
-```
+```bash
 $ pinpress help
 NAME
     pinpress - A Pinboard application that allows for the creation of
@@ -50,7 +50,7 @@ COMMANDS
 
 Note that each command's options can be revealed by adding the `--help` switch after the command. For example:
 
-```
+```bash
 $ pinpress pins --help
 NAME
     pins - Get posts from Pinboard
@@ -67,15 +67,128 @@ COMMAND OPTIONS
 
 # Initialization
 
-```
+```bash
 $ pinpress init
 ```
 
 Initialization will prompt you to enter your Pinboard API token. Once, entered, this (and other pertinent data) will be stored in `~/.pinpress`.
 
+# Getting Pins
+
+```bash
+$ 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.
+
+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"))
+* `-n`: the number of pins to return (e.g., 20)
+* `-t`: a CSV list of tags (e.g., "tag1,tag2") that must exist for the returned pins
+
+## Getting Pins From a Date Forward
+
+```bash
+$ pinpress pins -s 2014-01-01
+```
+
+...returns all pins from January 1, 2014 to the current day.
+
+## Getting Pins Until a Date
+
+```bash
+$ pinpress pins -e 2014-01-01
+```
+
+...returns all pins up to January 1, 2014.
+
+## Getting Pins Between a Date Range
+
+```bash
+$ pinpress pins -s 2014-01-01 -e 2014-01-31
+```
+
+## Getting Tagged Pins
+
+```bash
+$ pinpress pins -t "ruby,cli"
+```
+
+...returns all pins tagged "ruby" *and* "cli".
+
+**Naturally, these flags can be combined in any number of ways.**
+
+## Getting Pins Created Since Last Run
+
+Every time you run `pinpress pins`, the current date is added to `~/.pinpress`. Because of this, running:
+
+```bash
+$ pinpress pins last
+```
+
+...will get all the pins created since that date (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
+
+Pinpress can also work with tags in a Pinboard account:
+
+```bash
+$ 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.
+
+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"))
+* `-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
+
+```bash
+$ 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.
+
+## Getting Tags Until a Date
+
+```bash
+$ pinpress tags -e 2014-01-01
+```
+
+...returns all tags used up to January 1, 2014.
+
+## Getting Tags Between a Date Range
+
+```bash
+$ pinpress tags -s 2014-01-01 -e 2014-01-31
+```
+
+## Getting Tags that Have Been Used With Other Tags
+
+```bash
+$ 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.
+
+## Getting Tags Used Since Last Run
+
+Every time you run `pinpress tags`, the current date is added to `~/.pinpress`. Because of this, running:
+
+```bash
+$ pinpress tags last
+```
+
+...will get all the tags used since that date (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
 
-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**.
+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
 
@@ -85,13 +198,17 @@ Pin Templates define how a pin from Pinboard should be output.
 
 Pin Templates are placed under the `pin_templates` section of the `~/.pinpress` config file -- as an example:
 
-```YAML
+```yaml
 pin_templates:
 - name: pinpress_default
-  opener: "<ul\n"
+  opener: "<ul>\n"
+  item: >
+    <li>
+    <b><a title="<%= description %>" href="<%= href %>" target="_blank">
+    <%= description %></a>.</b>
+    <%= extended %>
+    </li>
   closer: "</ul>"
-  item: "<li><b><a title=\"<%= description %>\" href=\"<%= href %>\" target=\"_blank\"><%=
-    description %></a>.</b> <%= extended %></li>\n"
 ```
 
 A Pin Template can have several different sub-keys:
@@ -118,13 +235,13 @@ Additionally, a Pin Template can make use of several different tokens that are f
 
 Pin Templates can be used in two ways: they can either be called dynamically:
 
-```
+```bash
 $ pinpress pins template_name
 ```
 
 ...or a default template can be specified in `~/.pinpress`:
 
-```
+```yaml
 ---
 pinpress:
   config_location: "/Users/abach/.pinpress"
@@ -133,17 +250,46 @@ pinpress:
 pin_templates:
 - name: pinpress_default
   opener: "<ul>\n"
+  item: >
+    <li>
+    <b><a href="<%= href %>">
+    <%= description %></a>.</b>
+    <%= extended %>
+    </li>
   closer: "</ul>"
-  item: "<li><b><a title=\"<%= description %>\" href=\"<%= href %>\" target=\"_blank\"><%=
-    description %></a>.</b> <%= extended %></li>\N"
 ```
 
-The default template will be used when the `pins` command is run without any arguments:
+So, knowing the above, both:
 
-```
+```bash
 $ pinpress pins
 ```
 
+...and:
+
+```bash
+$ pinpress pins pinpress_default
+```
+
+...will output pin data in the format specified by that template:
+
+```html
+<ul>
+  <li>
+    <b>
+      <a href="http://www.macstories.net/tutorials/launch-center-pro-guide/">
+        Automating iOS: A Comprehensive Guide to Launch Center Pro
+      </a>.
+    </b>
+    This the most amazing article I've seen in a long time. So many tips, tricks,
+    and automations to make productivity easier.
+  </li>
+  <!-- ... -->
+</ul>
+```
+
+(Note that the nice indenting is for Github's sake; the actual output will conform to the formatting in `~/.pinpress`.)
+
 ## Tag Templates
 
 Tag Templates are exactly like Pin Templates, but are used for tags.
@@ -152,37 +298,37 @@ Tag Templates are exactly like Pin Templates, but are used for tags.
 
 They, too, are defined in `~/.pinpress`:
 
-```YAML
+```yaml
 tag_templates:
 - name: pinpress_default
   item: "<%= tag %> (<%= count %>),"
 ```
 
-A Pin Template can have several different sub-keys:
+A Tag Template makes use of the same sub-keys as Pin Template:
 
 * `name` (**required**): the name of the template
-* `opener` (*optional*): the text that should exist above the tags
-* `closer` (*optional*): the text that should exist below the tags
-* `item` (**required**): the formatted text that should be output for every pin
+* `opener` (*optional*): the text that should exist above the tag string
+* `closer` (*optional*): the text that should exist below the tag string
+* `item` (**required**): the formatted text that should be output for every tag
 
 ### Available Tokens
 
-Additionally, a Pin Template can make use of several different tokens that are filled by a pin's values:
+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 in the range
+* `<%= count %>`: the number of times the tag has been used (depending on the range used)
 
 ### Usage
 
 Pin Templates can be used in two ways: they can either be called dynamically:
 
-```
+```bash
 $ pinpress tags template_name
 ```
 
 ...or a default template can be specified in `~/.pinpress`:
 
-```
+```yaml
 ---
 pinpress:
   config_location: "/Users/abach/.pinpress"
@@ -195,134 +341,99 @@ tag_templates:
   item: "<%= tag %> (<%= count %>),"
 ```
 
-Again, the default template will be used when the `tags` command is run without any arguments:
+So, knowing the above, both:
 
-```
+```bash
 $ pinpress tags
 ```
 
-# Getting Pins
-
-```
-$ pinpress pins
-# <ul>
-#   <li>
-#     <b><a title="Technical Debt, a case study : tags" href="http://marcgravell.blogspot.com/2014/04/technical-debt-case-study-tags.html?m=1" target="_blank">Technical Debt, a case study : tags</a>.</b> A look at how programmers solve complex problems iteratively.
-#   </li>
-#   <li>
-#     <b><a title="Using Drafts for Remote CLI" href="https://gist.github.com/hiilppp/10993803" target="_blank">Using Drafts for Remote CLI</a>.</b> As a text file is added to a directory to which this AppleScript is associated as Folder Action, the content of the received file is executed as shell script and the generated output sent to an iOS device.
-#   </li>
-# </ul>
-```
-
-This simple command will return all pins from the user's account and output them based on the [Pin Template](https://github.com/bachya/PinPress#pin-templates "Pin Templates") provided.
-
-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"))
-* `-n`: the number of pins to return (e.g., 20)
-* `-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.
-
-## Getting Pins From a Date Forward
+...and:
 
+```bash
+$ pinpress tags pinpress_default
 ```
-$ pinpress pins -s 2014-01-01
-```
-
-...returns all pins from January 1, 2014 to the current day.
-
-## Getting Pins Until a Date
-
-```
-$ pinpress pins -e 2014-01-01
-```
-
-...returns all pins up to January 1, 2014.
-
-## Getting Pins Between a Date Range
-
-```
-$ pinpress pins -s 2014-01-01 -e 2014-01-31
-```
-
-## Getting Tagged Pins
-
-```
-$ pinpress pins -t "ruby,cli"
-```
-
-...returns all pins tagged "ruby" *and* "cli".
 
-# Getting Tags
-
-Pinpress can also work with tags in a Pinboard account:
+...will output tag data in the format specified by that template:
 
+```bash
+link-mash (15),app (2),ios (3),productivity (1),launch-center-pro (1),drafts (2),
 ```
-$ pinpress tags
-# => cli (1),github (1),applescript (1),osx (1),link-mash (1),
-```
-
-This simple command will return all tags from the user's account and output them based on the [Tag Template](https://github.com/bachya/PinPress#tag-templates "Tag Templates") provided.
 
-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"))
-* `-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)).
+# Other Configuration Options
 
-## Getting Tags From a Date Forward
+You can place special keys in the `pinpress` section of `~/.pinpress` to automate some actions:
 
-```
-$ pinpress tags -s 2014-01-01
-```
+```yaml
+pinpress:
+  # ...other keys...
 
-...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.
+  # The default `pins` template to use
+  default_pin_template
 
-## Getting Tags Until a Date
+  # The default `tags` template to use
+  default_tag_template
 
-```
-$ pinpress tags -e 2014-01-01
-```
+  # The default tags to be used when getting pins or associated tags
+  default_tags: ['tag1', 'tag2']
 
-...returns all tags used up to January 1, 2014.
+  # The tags to ignore when executing either `pins` or `tags`
+  ignored_tags: ['bad-tag', 'bad-tag2']
 
-## Getting Tags Between a Date Range
+  # The default number of results to return
+  default_num_results: 5
 
-```
-$ pinpress tags -s 2014-01-01 -e 2014-01-31
+  # ...other keys...
 ```
 
-## Getting Tags that Have Been Used With Other Tags
-
-```
-$ pinpress tags -t 'tag1,tag2' -s 2014-01-01
-```
+Do note:
 
-...returns all tags that have been used *alongside* `tag1` and `tag2`, starting on Jarnuary 1, 2014.
+* The `default_tags` key is overridden by the `-t` flag.
+* The `default_num_results` key is overridden by the `-n` flag.
 
-# Other Configuration Options
+# Link Mash Config File
 
-You can place special keys in the `pinpress` section of `~/.pinpress` to automate some actions:
+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
+```yaml
+---
 pinpress:
-  # ...other keys...
-  default_pin_template                  # The default `pins` template to use
-  default_tag_template                  # The default `tags` template to use
-  default_tags: ['tag1', 'tag2']        # The default tags to be used when getting pins or associated tags
-  ignored_tags: ['bad-tag', 'bad-tag2'] # The tags to ignore when executing either `pins` or `tags`
-  default_num_results: 5                # The default number of results to return
-  # ...other keys...
+  config_location: "/Users/abach/.pinpress"
+  default_pin_template: pinpress_default
+  default_tag_template: pinpress_default
+  default_tags: ['link-mash']
+  ignored_tags: ['buffer']
+  log_level: WARN
+  version: 1.1.1
+  api_token: bachya:b819312cf9ccee799b87
+pin_templates:
+- name: pinpress_default
+  opener: >
+    <em>The weekly Link Mash is a curated selection of tools, stories, and
+    other links that I found during my travels on the web. All of my curated
+    links can be found on <a title="Bachya's Pinboard: Link Mash"
+    href="https://pinboard.in/u:bachya/t:link-mash/" target="_blank">
+    my Pinboard</a>; you can also find the Link Mash archives <a
+    href="http://www.bachyaproductions.com/tag/link-mash/">here</a>.
+    </em>
+    <ul>
+  item: >
+    <li>
+    <b><a title="<%= description %>" href="<%= href %>" target="_blank">
+    <%= description %></a>.</b>
+    <%= extended %>
+    </li>
+  closer: >
+    </ul>
+    <hr/>
+    <em>This Link Mash was generated by <a title="PinPress"
+    href="https://github.com/bachya/pinpress" target="_blank">PinPress</a>,
+    a simple tool to generate text templates from <a title="Pinboard"
+    href="https://pinboard.in" target="_blank">Pinboard</a> data.</em>"
+tag_templates:
+- name: pinpress_default
+  item: "<%= tag %>,"
 ```
 
-Do note:
-
-* The `default_tags` key can be overridden by the `-t` flag.
-* The `default_num_results` key can be overridden by the `-n` flag.
-
 # Known Issues & Future Releases
 
 Check out the Pinpress roadmap via the [Trello Board](https://trello.com/b/lmuC8TT0/pinpress "Pinpress Trello Board").
@@ -331,11 +442,11 @@ Bugs, issues, and enhancement requests can be submitted on the [Issues Page](htt
 
 # Bugs and Feature Requests
 
-To report bugs with or suggest features/changes for Sifttter Redux, 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:
 
-* [Fork Sifttter Redux](http://github.com/bachya/PinPress/fork).
+* [Fork PinPress](http://github.com/bachya/PinPress/fork).
 * Create a branch for your contribution (`git checkout -b new-feature`).
 * Commit your changes (`git commit -am 'Added this new feature'`).
 * Push to the branch (`git push origin new-feature`).

data/bin/pinpress

@@ -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
 
 # ======================================================
@@ -124,64 +124,22 @@ command :pins do |c|
   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]
-        tags = options[:t].split(',')
-      elsif configuration.pinpress[:default_tags]
-        tags = configuration.pinpress[:default_tags]
-      end
-
-      ignored_tags = configuration.pinpress[:ignored_tags]
-      tags -= ignored_tags if ignored_tags
-      opts.merge!(tag: tags) if tags
-
-      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)?"
+  c.desc 'Gets all pins from the last run date + 1'
+  c.command :last do |last|
+    last.action do |global_options, options, args|
+      last_run_date = configuration.pinpress[:last_pins_run]
+      if last_run_date
+        options[:s] = last_run_date + 1
+        puts PinPress.get_data(PinPress::Template::TEMPLATE_TYPE_PIN, args, options)
+      else
+        messenger.warn("`pinpress pins` hasn't been run before.")
       end
     end
   end
+
+  c.action do |global_options, options, args|
+    puts PinPress.get_data(PinPress::Template::TEMPLATE_TYPE_PIN, args, options)
+  end
 end
 
 # ------------------------------------------------------
@@ -195,53 +153,23 @@ command :tags do |c|
   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]
-        tags = options[:t].split(',')
-      elsif configuration.pinpress[:default_tags]
-        tags = configuration.pinpress[:default_tags]
-      end
-
-      ignored_tags = configuration.pinpress[:ignored_tags]
-      tags -= ignored_tags if ignored_tags
-      opts.merge!(tag: tags) if tags
-
-      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)?"
+  c.desc 'Gets all tags from the last run date + 1'
+  c.command :last do |last|
+    last.action do |global_options, options, args|
+      last_run_date = configuration.pinpress[:last_tags_run]
+      if last_run_date
+        options[:s] = last_run_date + 1
+        puts PinPress.get_data(PinPress::Template::TEMPLATE_TYPE_TAG, args, options)
+      else
+        messenger.warn("`pinpress tags` hasn't been run before.")
       end
     end
   end
+
+  c.desc 'Gets the unique tags based on the passed criteria'
+  c.action do |global_options, options, args|
+    puts PinPress.get_data(PinPress::Template::TEMPLATE_TYPE_TAG, args, options)
+  end
 end
 
 # ------------------------------------------------------

data/lib/pinpress.rb

@@ -24,7 +24,7 @@ module PinPress
   # @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?
+    if template_hash
       template = PinPress::TagTemplate.new(template_hash)
       client = Pinboard::Client.new(token: configuration.pinpress[:api_token])
       yield template, client
@@ -33,6 +33,100 @@ module PinPress
     end
   end
 
+  # Generates a string of items from pins.
+  # @param [Fixnum] template_type
+  # @param [PinPress::Template] template
+  # @param [Array] pins
+  # @return [String]
+  def self.generate_items(template_type, template, pins, opts)
+    output = ''
+    case template_type
+    when PinPress::Template::TEMPLATE_TYPE_PIN
+      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]
+        output += ERB.new(template.item).result(binding)
+      end
+      configuration.pinpress[:last_pins_run] = Date.today
+    when PinPress::Template::TEMPLATE_TYPE_TAG
+      tags = []
+      pins.each { |p| tags += p[:tag] }
+      tags = tags.uniq.map { |t| { tag: t, count: tags.count(t) } }
+      tags.each do |t|
+        unless t[:tag] == opts[:tag]
+          tag   = t[:tag]
+          count = t[:count]
+          output += ERB.new(template.item).result(binding)
+        end
+      end
+      configuration.pinpress[:last_tags_run] = Date.today
+    end
+    output
+  end
+
+  # Generic function to get data from Pinboard.
+  # @param [Fixnum] template_type
+  # @param [Array] args
+  # @param [Hash] options
+  # @return [String]
+  def self.get_data(template_type, args, options)
+    output = ''
+
+    # 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]
+    t_name = args.empty? ? nil : args[0]
+
+    PinPress.execute_template(template_type, t_name) do |template, client|
+      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]
+        tags = options[:t].split(',')
+      elsif configuration.pinpress[:default_tags]
+        tags = configuration.pinpress[:default_tags]
+      end
+
+      ignored_tags = configuration.pinpress[:ignored_tags]
+      tags -= ignored_tags if ignored_tags
+      opts.merge!(tag: tags) if tags
+
+      begin
+        pins = client.posts(opts)
+        if pins.empty?
+          messenger.warn('No matching pins...')
+        else
+          output += template.opener if template.opener
+          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)?"
+      end
+    end
+  end
+
   # Determines whether a template exists.
   # @param [Fixnum] template_type
   # @param [<String, Symbol>] template_name
@@ -110,7 +204,7 @@ module PinPress
     tag_templates = configuration.tag_templates
 
     messenger.section('AVAILABLE PIN TEMPLATES:')
-    if !pin_templates.nil?
+    if pin_templates
       pin_templates.each_with_index do |template, index|
         messenger.info("#{ index + 1 }. #{ template[:name] }")
       end
@@ -119,7 +213,7 @@ module PinPress
     end
 
     messenger.section('AVAILABLE TAG TEMPLATES:')
-    if !tag_templates.nil?
+    if tag_templates
       tag_templates.each_with_index do |template, index|
         messenger.info("#{ index + 1 }. #{ template[:name] }")
       end

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.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinpress
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba