bloggy 0.1.1 → 0.2

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .DS_Store
+.idea

data/README.md

@@ -26,10 +26,15 @@ Once you run
 
 you will find the file structure you are used to seeing for creating blog posts, editing default layout etc. inside of the config/jekyll directory. There you can add add the same commands you would from a normal jekyll installation (they are provided at the <a href="https://github.com/mojombo/jekyll/wiki/Configuration">Jekyll configuration page</a>). So now just configure to your liking. (edit the default.html inside of _layouts for your main page and the post.html and page.html files for the corresponding results).
 
-I have provided a rake task to name and open your new blog post in textmate as default but feel free to change it to use the editor of your choice. To use it just run
+I have provided a rake task to name and open your new blog post for editing. To use it just run
 
     $ rake np post-title
 
+By default, your post will open in textmate, but you can override this by creating a .bloggyrc file in your home directory, containing the command line invocation of your editor.
+
+    # mine for Rubymine, subl for Sublime Text, mate for TextMate, etc.
+    editor: mine
+
 Your posts will be served from the public/blog directory inside of your rails application. After you write a new blog post simply run
 
     $ rake generate

data/bloggy.gemspec

@@ -3,10 +3,10 @@ $:.push File.expand_path("../lib", __FILE__)
 require "bloggy/version"
 
 Gem::Specification.new do |s|
-  s.authors       = ["Zach Bruhnke"]
+  s.authors       = ["Zach Bruhnke", "Eric Thiese"]
   s.email         = ["z@zbruhnke.com"]
   s.description   = %q{Add a Jekyll blog to an existing Rails application in seconds}
-  s.summary       = %q{generate a jekyll blog within a rails application quickly and easily. No additonal nginx config required}
+  s.summary       = %q{generate a jekyll blog within a rails application quickly and easily. No additional nginx config required}
   s.homepage      = "http://github.com/zbruhnke/bloggy"
 
   s.files         = `git ls-files`.split($\)

data/lib/bloggy/version.rb

@@ -1,3 +1,3 @@
 module Bloggy
-  VERSION = "0.1.1"
+  VERSION = "0.2"
 end

data/lib/generators/jekyll/blog/blog_generator.rb

@@ -3,12 +3,12 @@ class Jekyll::BlogGenerator < Rails::Generators::NamedBase
     argument :name, :type => :string, :default => "blog"
 
     def copy_config_file
-        copy_file 'config/jekyll/_config.yml.tt', 'config/jekyll/_config.yml'
+        template  'config/jekyll/_config.yml.tt', 'config/jekyll/_config.yml'
         copy_file 'config/jekyll/atom.xml.tt', 'config/jekyll/atom.xml'
-        copy_file 'config/jekyll/index.html.tt', 'config/jekyll/index.html'
-        copy_file 'config/jekyll/_layouts/default.html.tt', 'config/jekyll/_layouts/default.html'
+        template  'config/jekyll/index.html.tt', 'config/jekyll/index.html'
+        template  'config/jekyll/_layouts/default.html.tt', 'config/jekyll/_layouts/default.html'
+        template  'config/jekyll/_layouts/post.html.tt', 'config/jekyll/_layouts/post.html'
         copy_file 'config/jekyll/_layouts/page.html.tt', 'config/jekyll/_layouts/page.html'
-        copy_file 'config/jekyll/_layouts/post.html.tt', 'config/jekyll/_layouts/post.html'
         copy_file 'config/jekyll/_posts/2012-04-25-a-test-post.markdown.tt', 'config/jekyll/_posts/2012-04-25-a-test-post.markdown'
         copy_file 'config/jekyll/css/screen.css.tt', 'config/jekyll/css/screen.css'
         copy_file 'config/jekyll/css/syntax.css.tt', 'config/jekyll/css/syntax.css'
@@ -16,7 +16,7 @@ class Jekyll::BlogGenerator < Rails::Generators::NamedBase
         copy_file 'tasks/gen.rake.tt', 'lib/tasks/gen.rake'
     end
 
-    def create_blog source = 'config/jekyll', destination = 'public/blog'
+    def create_blog source = 'config/jekyll', destination = File.join('public',"#{name}")
         options = {
             'source' => source,
             'destination' => destination

data/lib/generators/jekyll/blog/templates/config/jekyll/_config.yml.tt

@@ -1,6 +1,6 @@
 markdown: rdiscount
 permalink: /:title.html
-destination: ../../public/blog
+destination: ../../public/<%= name %>
 auto: true
 exclude:
   - Rakefile

data/lib/generators/jekyll/blog/templates/config/jekyll/_layouts/default.html.tt

@@ -6,10 +6,10 @@
    <meta name="author" content="Zach Bruhnke" />
 
    <!-- syntax highlighting CSS -->
-   <link rel="stylesheet" href="/blog/css/syntax.css" type="text/css" />
+   <link rel="stylesheet" href="/<%= name %>/css/syntax.css" type="text/css" />
 
    <!-- Homepage CSS -->
-   <link rel="stylesheet" href="/blog/css/screen.css" type="text/css" media="screen, projection" />
+   <link rel="stylesheet" href="/<%= name %>/css/screen.css" type="text/css" media="screen, projection" />
 
    <!-- Typekit -->
    <script type="text/javascript" src="http://use.typekit.com/jpd0pfm.js"></script>
@@ -25,8 +25,8 @@ var WRInitTime=(new Date()).getTime();
 
 <div class="site">
   <div class="title">
-    <a href="/blog">Zach Bruhnke</a>
-    <a class="extra" href="/blog">Bloggy</a>
+    <a href="/<%= name %>">Zach Bruhnke</a>
+    <a class="extra" href="/<%= name %>">Bloggy</a>
   </div>
   
   {{ content }}

data/lib/generators/jekyll/blog/templates/config/jekyll/_layouts/post.html.tt

@@ -9,7 +9,7 @@ layout: default
   <h2>Related Posts</h2>
   <ul class="posts">
     {% for post in site.related_posts limit:3 %}
-      <li><span>{{ post.date | date_to_string }}</span> &raquo; <a href="/blog{{ post.url }}">{{ post.title }}</a></li>
+      <li><span>{{ post.date | date_to_string }}</span> &raquo; <a href="/<%= name %>{{ post.url }}">{{ post.title }}</a></li>
     {% endfor %}
   </ul>
-</div>
+</div>

data/lib/generators/jekyll/blog/templates/config/jekyll/index.html.tt

@@ -7,7 +7,7 @@ title: Zach Bruhnke
   <h1>Blog Posts</h1>
   <ul class="posts">
     {% for post in site.posts %}
-      <li><span>{{ post.date | date_to_string }}</span> &raquo; <a href="/blog{{ post.url }}">{{ post.title }}</a></li>
+      <li><span>{{ post.date | date_to_string }}</span> &raquo; <a href="/<%= name %>{{ post.url }}">{{ post.title }}</a></li>
     {% endfor %}
   </ul>
-</div>
+</div>

data/lib/generators/jekyll/blog/templates/tasks/new_post.rake.tt

@@ -11,14 +11,29 @@ task :np do
   path = "config/jekyll/_posts/#{Date.today}-#{title.downcase.gsub(/[^[:alnum:]]+/, '-')}.markdown"
   
   if File.exist?(path)
-  	puts "[WARN] File exists - skipping create"
+    puts "[WARN] File exists - skipping create"
   else
     File.open(path, "w") do |file|
       file.puts YAML.dump({'layout' => 'post', 'published' => false, 'title' => title})
       file.puts "---"
     end
+
+    begin
+      config = {'editor' => 'mate'}
+      if File.exist?("#{Dir.home}/.bloggyrc")
+        config.merge!(YAML.load_file("#{Dir.home}/.bloggyrc"))
+      end
+    rescue TypeError
+      puts "[WARN] Failed to parse editor from .bloggyrc"
+    end
+    
+    begin
+    `#{config['editor']} #{path}`
+    rescue Exception
+      puts "[WARN] Could not find editor #{config['editor']} - please edit #{path} manually"
+    end
+
   end
-  `mate #{path}`
 
   exit 1
-end
+end

data/test/test_generate_blog.rb

@@ -11,7 +11,7 @@ require 'rails/generators/actions'
 
 class TestGenerateBlog < Test::Unit::TestCase
     context "creating blog" do
-        should "genearte blog" do
+        should "generate blog" do
             source = 'config/jekyll'
             destination = 'blog'
             #Rails::Generators::Actions.generate('jekyll', '')

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: bloggy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
 - Zach Bruhnke
+- Eric Thiese
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70100066950060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70100066950060
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70100066949560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70100066949560
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70100066949140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70100066949140
 - !ruby/object:Gem::Dependency
   name: rack-contrib
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70100066948540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70100066948540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70100066948020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +66,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+  version_requirements: *70100066948020
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70100066947160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,15 +77,10 @@ dependencies:
         version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.11'
+  version_requirements: *70100066947160
 - !ruby/object:Gem::Dependency
   name: redgreen
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70100066945900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +88,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+  version_requirements: *70100066945900
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70100066944940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,15 +99,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
+  version_requirements: *70100066944940
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70100066944480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,31 +110,21 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  version_requirements: *70100066944480
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70100066944020 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '1.1'
+  version_requirements: *70100066944020
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70100066943200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -181,15 +132,10 @@ dependencies:
         version: '4.2'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.2'
+  version_requirements: *70100066943200
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70100066927960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,15 +143,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
+  version_requirements: *70100066927960
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70100066927420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -213,12 +154,7 @@ dependencies:
         version: '1.9'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.9'
+  version_requirements: *70100066927420
 description: Add a Jekyll blog to an existing Rails application in seconds
 email:
 - z@zbruhnke.com
@@ -269,11 +205,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: bloggy
-rubygems_version: 1.8.22
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: generate a jekyll blog within a rails application quickly and easily. No
-  additonal nginx config required
+  additional nginx config required
 test_files:
 - test/helper.rb
 - test/test_generate_blog.rb