planet 0.3.7 → 0.3.8

data/bin/planet

@@ -1,11 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'gli'
-require 'box'
 require 'planet'
 
 include GLI
-include Box
 
 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'
 
@@ -40,7 +38,27 @@ 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.yml']) }
+    default = '## 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'
+
+
+    File.open('planet.yml', 'w') { |f| f.write(default) }
 
     puts '=> Created default planet.yml'
   end
@@ -51,19 +69,35 @@ command :create_templates do |c|
   c.action do |global_options,options,args|
     conf = YAML.load_file('planet.yml')
 
-    templates_dir = conf.fetch('planet').fetch('templates_directory', 'source/_layouts/')
+    templates_dir = conf.fetch('planet').fetch('templates_directory', '_layouts/')
 
     FileUtils.mkdir_p(templates_dir)
 
+    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>
+'
     if !File.exists?(templates_dir + 'author.html')
-      File.open(templates_dir + 'author.html', 'w') { |f| f.write(Box::FILES['author.html']) }
+      File.open(templates_dir + 'author.html', 'w') { |f| f.write(author) }
       puts "=> Created default #{ templates_dir }author.html"
     else
       puts "=> Template #{ templates_dir }author.html already exists, skipping"
     end
 
+    header ='---
+title: "{{ post_title }}"
+kind: article
+created_at: {{ post_date }}
+author: {{ author }}
+layout: post
+---
+'
     if !File.exists?(templates_dir + 'header.md')
-      File.open(templates_dir + 'header.md', 'w') { |f| f.write(Box::FILES['header.md']) }
+      File.open(templates_dir + 'header.md', 'w') { |f| f.write(header) }
       puts "=> Created default #{ templates_dir }header.md"
     else
       puts "=> Template #{ templates_dir }header.md already exists, skipping"
@@ -75,10 +109,10 @@ pre do |global,command,options,args|
   if command.name == :generate
     conf = YAML.load_file('planet.yml')
 
-    templates_dir = conf.fetch('planet').fetch('templates_directory', 'source/_layouts/')
+    templates_dir = conf.fetch('planet').fetch('templates_directory', 'source/_layouts')
     FileUtils.mkdir_p(templates_dir)
 
-    files = [templates_dir, templates_dir + 'author.html', templates_dir + 'header.md']
+    files = [templates_dir + 'author.html', templates_dir + 'header.md']
 
     files.each do |file|
       unless File.exists?(file)
@@ -101,41 +135,3 @@ on_error do |exception|
 end
 
 exit GLI.run(ARGV)
-
-__END__
-@@ header.md
----
-title: "{{ post_title }}"
-kind: article
-created_at: {{ post_date }}
-author: {{ author }}
-layout: post
----
-
-@@ author.html
-<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>
-
-@@ planet.yml
-## 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 @@ module Planet
   module Version
     MAJOR = 0
     MINOR = 3
-    PATCH = 7
+    PATCH = 8
 
     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.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -75,22 +75,6 @@ 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: