planet 0.4.0 → 0.4.1

data/bin/planet

@@ -4,45 +4,10 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 require 'gli'
 require 'planet'
 require 'fileutils'
+require 'box'
 
 include GLI::App
 
-TEMPLATES = {
-  author:  '
-<div class="author">
-  <img src="{{ image_url }}" style="width: 96px; height: 96;">
-  <span style="position: absolute; padding: 32px 15px;">
-    <i>Original post by <a href="{{ twitter_url }}">{{ author }}</a> - check out <a href="{{ blog_url }}">{{ blog_name }}</a></i>
-  </span>
-</div>
-',
-  header: '---
-title: "{{ post_title }}"
-kind: article
-created_at: {{ post_date }}
-author: {{ author }}
-layout: post
----
-',
-  planet: '## Planet.rb default config file, modify it and spawn awesomeness!
-
-planet:
-    posts_directory: source/_posts/
-    templates_directory: source/_layouts/
-
-blogs:
-  # Bare minimum to get it working
-  - author: "Cubox"
-    feed:   "http://blog.cuboxlabs.com/atom.xml"
-    image:  "http://cuboxlabs.com/img/cubox-humans/could-be-you.png"
-
-  - author: "Pablo Astigarraga"
-    feed:   "http://blog.poteland.com/atom.xml"
-    image:  "http://poteland.com/images/avatars/red_mage.png"
-    # Other fields:
-    twitter: "poteland"
-    url: "http://blog.poteland.com"    # => only required for people that don\'t have a \'url\' field on their RSS/Atom field'
-}
 
 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'
 
@@ -72,7 +37,7 @@ 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(TEMPLATES[:planet]) }
+    File.open('planet.yml', 'w') { |f| f.write(Box::FILES['planet']) }
 
     puts '=> Created default planet.yml'
   end
@@ -88,14 +53,14 @@ command :create_templates do |c|
     FileUtils.mkdir_p(templates_dir)
 
     if !File.exists?(templates_dir + 'author.html')
-      File.open(templates_dir + 'author.html', 'w') { |f| f.write(TEMPLATES[:author]) }
+      File.open(templates_dir + 'author.html', 'w') { |f| f.write(Box::FILES['author']) }
       puts "=> Created default #{ templates_dir }author.html"
     else
       puts "=> Template #{ templates_dir }author.html already exists, skipping"
     end
 
     if !File.exists?(templates_dir + 'header.md')
-      File.open(templates_dir + 'header.md', 'w') { |f| f.write(TEMPLATES[:header]) }
+      File.open(templates_dir + 'header.md', 'w') { |f| f.write(Box::FILES['header']) }
       puts "=> Created default #{ templates_dir }header.md"
     else
       puts "=> Template #{ templates_dir }header.md already exists, skipping"
@@ -103,6 +68,13 @@ command :create_templates do |c|
   end
 end
 
+desc 'Outputs planet.rb gem version'
+command :version do |c|
+  c.action do |global_options,options,args|
+    puts "planet.rb version: #{ Planet::VERSION }"
+  end
+end
+
 desc 'Delete existing templates and recreate them'
 command :update_templates do |c|
   c.action do |global_options,options,args|
@@ -136,7 +108,7 @@ pre do |global,command,options,args|
         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`
         puts response
-      elsif TEMPLATES[name] != File.read(path)
+      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."
       end
     end
@@ -154,3 +126,41 @@ on_error do |exception|
 end
 
 exit run(ARGV)
+
+__END__
+@@ author
+<div class="author">
+  <img src="{{ image_url }}" style="width: 96px; height: 96;">
+  <span style="position: absolute; padding: 32px 15px;">
+    <i>Original post by <a href="{{ twitter_url }}">{{ author }}</a> - check out <a href="{{ blog_url }}">{{ blog_name }}</a></i>
+  </span>
+</div>
+
+@@  header
+---
+title: "{{ post_title }}"
+kind: article
+created_at: {{ post_date }}
+author: {{ author }}
+layout: post
+---
+
+@@  planet
+## Planet.rb default config file, modify it and spawn awesomeness!
+
+planet:
+    posts_directory: source/_posts/
+    templates_directory: source/_layouts/
+
+blogs:
+  # Bare minimum to get it working
+  - author: "Cubox"
+    feed:   "http://blog.cuboxlabs.com/atom.xml"
+    image:  "http://cuboxlabs.com/img/cubox-humans/could-be-you.png"
+
+  - author: "Pablo Astigarraga"
+    feed:   "http://blog.poteland.com/atom.xml"
+    image:  "http://poteland.com/images/avatars/red_mage.png"
+    # Other fields:
+    twitter: "poteland"
+    url: "http://blog.poteland.com"    # => only required for people that don\'t have a \'url\' field on their RSS/Atom field'

data/lib/planet/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: planet
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: box
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: pote@tardis.com.uy
 executables:
@@ -74,7 +90,7 @@ files:
 - lib/planet/post.rb
 - lib/planet/version.rb
 - lib/planet.rb
-homepage: http://poteland.com
+homepage: http://github.com/pote/planet.rb
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -98,5 +114,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: An awesome rss/atom feed aggregator designed to work with Octopress/Jekyll
+summary: An rss/atom feed aggregator designed to work with Octopress/Jekyll
 test_files: []