pinpress 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e914899e1c35ca22202b9ec594bfaa096d10835
-  data.tar.gz: 8547f9bb8e6a29818f6fe24aaaf64c1aec487fa7
+  metadata.gz: cb9834c1b4b146171b5dd3775335edc642590a30
+  data.tar.gz: 43363332876a9e29eec3a8fee3ca921a0bad00c1
 SHA512:
-  metadata.gz: 7cbf914686ec155cdf2bf989a912fbf307fcb43152f161f27100639884e5162dfb5bf7009c316ae50badb326c7df96ada8d21f0c9df988ca1b32a76340e40ca1
-  data.tar.gz: 8b8033020e7f7394c042441496b30381b96efeea00446f6197f8ad23ad5594d2c929153596d14251f80bdca90a914f270cbb0d2a65f03591d42b169f9c5bee90
+  metadata.gz: dad5319aac8cef3d99bb986beb9eb3dac341acb97ab019ae5a812cd36a935135a6a6a10eb1b648bf0148213059416fd783ed3055de1788b2c23d961de3ad3a9c
+  data.tar.gz: 37711b8fc8f9db2968133dff075424eb0ddf6c1a1398692e9d5a041c739e41425ebda9f070645e9d29d309296815910f0e90989f41acf369d29631e2436ae64f

data/HISTORY.md

@@ -1,3 +1,9 @@
+# 1.5.0 (2014-05-21)
+
+* Applied default tags and ignored tags to templates, rather than globally
+* `last` commands will run every time, even if they've never run before
+* Small refactorings
+
 # 1.4.2 (2014-05-16)
 
 * Some small refactorings

data/bin/pinpress

@@ -148,7 +148,7 @@ command :pins do |c|
     opts = {}
     opts.merge!(todt: Chronic.parse(options[:e])) if options[:e]
     opts.merge!(fromdt: Chronic.parse(options[:s])) if options[:s]
-    opts.merge!(PinPress.merge_common_options(options))
+    opts.merge!(PinPress.merge_common_options(options, template_name, PinPress::Template::TYPE_PIN))
 
     # Request pin data from Pinboard and output the return data.
     output = PinPress.pin_yield(template, opts)
@@ -168,24 +168,25 @@ command :pins do |c|
       # and/or the presence of a default template.
       template_name, template = PinPress.init_template(options[:m], PinPress::Template::TYPE_PIN)
 
+      opts = {}
+
       last_run_date = configuration.pin_templates.find { |t| t.keys[0] == template_name.to_sym }.values[0].last_run
       if last_run_date
         # Set one option: the start date. Set it to the last-run date + 1.
-        opts = {}
         opts.merge!(fromdt: DateTime.parse(last_run_date) + 1)
-        opts.merge!(PinPress.merge_common_options(options))
+      end
 
-        # Request pin data from Pinboard and output the return data.
-        output = PinPress.pin_yield(template, opts)
-        puts output if output
+      # Set our common options.
+      opts.merge!(PinPress.merge_common_options(options, template_name, PinPress::Template::TYPE_PIN))
 
-        # Save the last-run date to the configuration file.
-       configuration.pin_templates.find { |t| t.keys[0] == template_name.to_sym}.values[0].last_run = Time.now.utc.iso8601
-       configuration.save
-      else
-        messenger.warn("`pinpress pins` hasn't been run before.")
-      end
-    end
+      # Request pin data from Pinboard and output the return data.
+      output = PinPress.pin_yield(template, opts)
+      puts output if output
+
+      # Save the last-run date to the configuration file.
+      configuration.pin_templates.find { |t| t.keys[0] == template_name.to_sym}.values[0].last_run = Time.now.utc.iso8601
+      configuration.save
+   end
   end
 end
 
@@ -214,7 +215,7 @@ command :tags do |c|
     opts = {}
     opts.merge!(todt: Chronic.parse(options[:e])) if options[:e]
     opts.merge!(fromdt: Chronic.parse(options[:s])) if options[:s]
-    opts.merge!(PinPress.merge_common_options(options))
+    opts.merge!(PinPress.merge_common_options(options, template_name, PinPress::Template::TYPE_PIN))
 
     # Request tag data from Pinboard and output the return data.
     output = PinPress.tag_yield(template, opts)
@@ -233,27 +234,28 @@ command :tags do |c|
       # and/or the presence of a default template.
       template_name, template = PinPress.init_template(options[:m], PinPress::Template::TYPE_TAG)
 
+      opts = {}
+
       last_run_date = configuration.tag_templates.find { |t| t.keys[0] == template_name.to_sym }.values[0].last_run
       if last_run_date
         PinPress.verbose = global_options[:v]
 
         # Set one option: the start date. Set it to the last-run date + 1.
-        opts = {}
         opts.merge!(fromdt: DateTime.parse(last_run_date) + 1)
-        opts.merge!(PinPress.merge_common_options(options))
-
-        # Request tag data from Pinboard and output the return data.
-        output = PinPress.tag_yield(template, opts)
-        puts output if output
-
-        # Save the last-run date to the configuration file.
-        t_config = configuration.tag_templates.find { |t| t.keys[0] == template_name.to_sym}.values[0]
-        t_config.last_run = Time.now.utc.iso8601
-        configuration.save
-      else
-        messenger.warn("`pinpress tags` hasn't been run before.")
       end
-    end
+ 
+      # Set our common options.
+      opts.merge!(PinPress.merge_common_options(options, template_name, PinPress::Template::TYPE_PIN))
+      
+      # Request tag data from Pinboard and output the return data.
+      output = PinPress.tag_yield(template, opts)
+      puts output if output
+
+      # Save the last-run date to the configuration file.
+      t_config = configuration.tag_templates.find { |t| t.keys[0] == template_name.to_sym}.values[0]
+      t_config.last_run = Time.now.utc.iso8601
+      configuration.save
+   end
   end
 end
 

data/lib/pinpress.rb

@@ -159,18 +159,25 @@ module PinPress
   # and tag requests.
   # @param [Hash] options
   # @return [Hash]
-  def merge_common_options(options)
+  def merge_common_options(options, template_name, template_type)
+    case template_type
+    when PinPress::Template::TYPE_PIN
+      section = configuration.pin_templates.find { |t| t.keys[0] == template_name.to_sym}.values[0]
+    when PinPress::Template::TYPE_TAG
+      section = configuration.tag_templates.find { |t| t.keys[0] == template_name.to_sym}.values[0]
+    end
+
     opts = {}
     if options[:n]
       opts.merge!(results: options[:n])
-    elsif configuration.pinpress.default_num_results
-      opts.merge!(results: configuration.pinpress.default_num_results)
+    elsif section.default_num_results
+      opts.merge!(results: section.default_num_results)
     end
 
     if options[:t]
       opts.merge!(tag: options[:t])
-    elsif configuration.pinpress.default_tags
-      opts.merge!(tag: configuration.pinpress.default_tags.join(','))
+    elsif section.default_tags
+      opts.merge!(tag: section.default_tags.join(','))
     end
     opts
   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.4.2'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinpress
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba