planet 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a452a7fa90ffe5f8068a88ac07983ee2ce13a3b5
-  data.tar.gz: db39ed053a48787f6057462204c267778d32f1b2
+  metadata.gz: fc9853812a11a4693abf7bd40cb460904efb136c
+  data.tar.gz: c85ae576b4f93b369a5f85fb4c2daa77c231e4ac
 SHA512:
-  metadata.gz: 49068d50bc0f7afdb365d42a5f273aa35efcce2e6476b2f35596ef5f6adcbb19357aeb75a9bb05d13c222d8b5403e1b7c572c65eda2d3e33d156a38502ad8ede
-  data.tar.gz: d10d441aadc823b766e1d295f6ae68b0caf78dd134fd4c6a45ade0ce86da08e7e954ebc226943eb00cba3a57b6c3903b8a869a60946bb58a5ec92575768ce470
+  metadata.gz: e657ce7a41137f5d88aac9c72ed02b6a037dfa1bb4d93f108e33f8e91f7a48ee09aab6695d304511693f1fd634d14822a1a2663b31cc39d2f5976e8c8c759736
+  data.tar.gz: 9d918de83e623d4f60ff086660c2c16ea9844c36968e44a1aa86c952f36dce04b4d6b97b975c6ae8ec3877b68b0debb97aa99b1bf70e3f91208ba7bbe950c583

data/bin/planet

@@ -10,6 +10,8 @@ include GLI::App
 
 program_desc 'Planet.rb is an awesome feed-aggregator gem that consumes RSS/Atom feeds and outputs them in a format suitable to use with Octopress or Jekyll'
 
+flag [:c,:config], :default_value => 'planet.yml', :desc => "Planet configuration file"
+
 desc 'Parses planet.yml file for blogs and generates their posts in Jekyll compliant format under the _posts directory'
 command :generate do |c|
 
@@ -21,7 +23,7 @@ due to spacing issues possible with markdown.
 }
   c.action do |global_options,options,args|
 
-    Planet::Importer.import('planet.yml') do |planet|
+    Planet::Importer.import(global_options[:config]) do |planet|
 
       post_extension = options[:extension] || 'markdown'
       post_extension = '.' + post_extension unless post_extension[0] == '.'
@@ -43,18 +45,17 @@ end
 desc 'Creates basic planet.yml config file'
 command :init do |c|
   c.action do |global_options,options,args|
-    abort 'There is already a planet.yml file present' if File.exist? 'planet.yml'
-
-    File.open('planet.yml', 'w') { |f| f.write(Box::FILES['planet']) }
-
-    puts '=> Created default planet.yml'
+    abort 'There is already a planet.yml file present' if File.exist?(global_options[:config])
+    File.open(global_options[:config], 'w') { |f| f.write(Box::FILES['planet']) }
+    puts "=> Created default #{global_options[:config]}"
   end
 end
 
-desc 'Creates basic templates on the templates_directory specified in planet.yml'
+desc "Creates basic templates on the templates_directory specified in configuration file"
 command :create_templates do |c|
   c.action do |global_options,options,args|
-    conf = YAML.load_file('planet.yml')
+    STDERR.puts "DEBUG: #{caller.first} global_options[:config]=#{global_options[:config].inspect}"
+    conf = YAML.load_file(global_options[:config])
 
     templates_dir = conf.fetch('planet').fetch('templates_directory', 'source/_layouts/')
 
@@ -86,25 +87,24 @@ end
 desc 'Delete existing templates and recreate them'
 command :update_templates do |c|
   c.action do |global_options,options,args|
-    conf = YAML.load_file('planet.yml')
+    conf = YAML.load_file(global_options[:config])
 
     templates_dir = conf.fetch('planet').fetch('templates_directory', 'source/_layouts/')
 
     author = templates_dir + 'author.html'
     header = templates_dir + 'header.md'
 
-
     File.delete(author) if File.exists?(author)
     File.delete(header) if File.exists?(header)
 
-    response = `#{ $0 } create_templates`
+    response = `#{$0} -d #{global_options[:config]} create_templates`
     puts response
   end
 end
 
 pre do |global,command,options,args|
   if command.name == :generate
-    conf = YAML.load_file('planet.yml')
+    conf = YAML.load_file(global[:config])
 
     templates_dir = conf.fetch('planet').fetch('templates_directory', 'source/_layouts')
     FileUtils.mkdir_p(templates_dir)
@@ -114,7 +114,9 @@ pre do |global,command,options,args|
     files.each do |name, path|
       if !File.exists?(path)
         puts "=> You are missing some files in your templates directory, planet.rb will create them for you - make sure to review them on #{ templates_dir }!"
-        response = `#{$0} create_templates`
+
+        response = `#{$0} -c #{global[:config]} create_templates`
+
         puts response
       elsif Box::FILES[name] != File.read(path)
         puts "!! WARNING: your planet.rb template files are different from the default, if you haven't made specific changes to them yourself then planet.rb default templates might have changed.Run 'planet update_templates' to override your current files with the newest default file available."
@@ -130,6 +132,8 @@ post do |global,command,options,args|
 end
 
 on_error do |exception|
+  STDERR.puts "Error: #{exception} (#{exception.class})"
+  STDERR.puts exception.backtrace.join("\n")
   true
 end
 

data/lib/planet/parsers.rb

@@ -1,4 +1,4 @@
-require 'feedzirra'
+require 'feedjira'
 require 'set'
 
 # Parsers class - manager for the feed parsers
@@ -44,7 +44,7 @@ class Planet::Parsers
   end
 
   # returns any parser that can handle this feeds' domain,
-  # defaults to Feedzirra if none available.
+  # defaults to Feedjira if none available.
   def get_parser_for(feed)
     feed_domain = URI(feed).host
 
@@ -52,7 +52,7 @@ class Planet::Parsers
       return parser if feed_domain.end_with? domain
     end
 
-    return Feedzirra::Feed # default generic parser
+    return Feedjira::Feed # default generic parser
   end
 end
 

data/lib/planet/post.rb

@@ -1,3 +1,4 @@
+require 'stringex_lite'
 require 'mustache'
 
 class Planet::Post
@@ -26,6 +27,7 @@ class Planet::Post
       author: self.blog.author,
       blog_url: self.blog.url,
       blog_name: self.blog.name,
+      blog_slug: self.blog.name.to_url(:limit => 50, :truncate_words => true),
       post_url: self.url,
       twitter: self.blog.twitter,
       twitter_url: "http://twitter.com/#{ self.blog.twitter }",
@@ -55,7 +57,7 @@ class Planet::Post
     name_date = date ? date.strftime('%Y-%m-%d') : nil
     name_title = title.downcase.scan(/\w+/).join('-')
 
-    [name_date, name_title].join('-')
+    [name_date, name_title].join('-')[0..59] # can return a file name that is too long, so truncate here to 60 chars
   end
 
 end

data/lib/planet/version.rb

@@ -2,7 +2,7 @@ class Planet
   module Version
     MAJOR = 0
     MINOR = 5
-    PATCH = 2
+    PATCH = 3
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: planet
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - PoTe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: feedzirra
+  name: feedjira
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: stringex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: pote@tardis.com.uy
 executables: