re-org 0.0.3 → 0.0.4

data/bin/re-org

@@ -8,7 +8,7 @@ doc = <<OPTIONS
 re-org: A tool to help re-organize your texts written in Org mode
 
 Usage:
-  re-org new <template>   [--notebook=<notebook>] [--title=<title>]  [--path=<path>]
+  re-org new <template>   [--notebook=<notebook>] [--title=<title>] [--category=<category>] [--date=<date>] [--layout=<layout>] [--path=<path>]
   re-org status           [--notebook=<notebook>] [--count-keywords]
   re-org templates        [--name=<name>]
 

data/lib/re-org/command.rb

@@ -86,7 +86,10 @@ module ReOrg
     end
 
     def new_file
-      @org = OrgFile.new({ :title => @options["--title"],
+      @org = OrgFile.new({ :category => @options["--category"],
+                           :date => @options["--date"],
+                           :title => @options["--title"],
+                           :layout => @options["--layout"],
                            :template => @options["<template>"],
                            :notebook => @options["<notebook>"] || @options["--notebook"],
                            :path     => @options["--path"]
@@ -96,7 +99,7 @@ module ReOrg
       c = 1
       while File.exists?(@org[:file])
         c += 1
-        @org[:filename] = Time.at(@org[:time]).strftime("%Y-%m-%d-%s-#{c}")
+        @org[:filename] = @org[:date] ? "#{@org[:date]}-#{c}" : Time.at(@org[:time]).strftime("%Y-%m-%d-%s-#{c}")
         @org[:file]     = File.expand_path(File.join(@org[:todo_dir], "#{@org[:filename]}.org"))
       end
       template =  @org[:template] || 'writing'

data/lib/re-org/org_file.rb

@@ -11,7 +11,7 @@ module ReOrg
 
       @options[:title]         ||= 'Untitled'
       @options[:time]            = Time.now
-      @options[:date]            = Time.at(@options[:time]).strftime("%Y-%m-%d")
+      @options[:date]          ||= Time.at(@options[:time]).strftime("%Y-%m-%d")
       @options[:org_format_date] = org_format_date(@options[:time])
       @options[:todo_dir]      ||= @options[:path] || OrgFile.todo_dir
       @options[:done_dir]      ||= OrgFile.done_dir
@@ -35,7 +35,7 @@ module ReOrg
 
     def resolve_filename
       slug = slugify(@options[:title] || @options[:notebook])
-      Time.at(@options[:time]).strftime("%Y-%m-%d-#{slug}")
+      @options[:date] ? "#{@options[:date]}-#{slug}" : Time.at(@options[:time]).strftime("%Y-%m-%d-#{slug}")
     end
 
     def slugify(name)

data/lib/re-org/templates/jekyll-post.org

@@ -1,5 +1,5 @@
 #+title:         <%= @org[:title].capitalize.gsub("-", " ") %>
 #+date:          <%= @org[:date] %>
-#+layout:        post
-#+category:      posts
+#+layout:        <%= @org[:layout] ? @org[:layout] : 'post' %>
+#+category:      <%= @org[:category] ? @org[:category] : 'posts' %>
 

data/lib/re-org/version.rb

@@ -1,3 +1,3 @@
 module ReOrg
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/command_spec.rb

@@ -46,6 +46,50 @@ describe ReOrg::Command do
     end
   end
 
+  context "when using `re-org new jekyll-post`" do
+    before(:each) do
+      @cmd = {
+        "new"        => true,
+        "<template>" => 'jekyll-post',
+        "--title"    => "test-#{$test_number}",
+      }
+    end
+
+    it 'should create a new jekyll-post with the --title option' do
+      o = ReOrg::Command.new(@cmd)
+      o.execute!
+      orgs = Dir["#{@dir}/todo/*"]
+      orgs.count.should == 1
+    end
+
+    it 'should create a new jekyll-post with an arbitrary date given the --date option' do
+      @cmd['--date']    = '2014-03-29'
+      o = ReOrg::Command.new(@cmd)
+      o.execute!
+      orgs = Dir["#{@dir}/todo/*"]
+      orgs.count.should == 1
+      orgs.first.should =~ /2014-03-29/
+    end
+
+    it 'should create a new jekyll-post with a layout set by --layout option' do
+      @cmd['--layout']    = 'main'
+      o = ReOrg::Command.new(@cmd)
+      o.execute!
+      orgs = Dir["#{@dir}/todo/*"]
+      orgs.count.should == 1
+      File.open(orgs.first).read().should =~ /\#\+layout\:        main/
+    end
+
+    it 'should create a new jekyll-post with a category set by --category option' do
+      @cmd['--category']    = 'food'
+      o = ReOrg::Command.new(@cmd)
+      o.execute!
+      orgs = Dir["#{@dir}/todo/*"]
+      orgs.count.should == 1
+      File.open(orgs.first).read().should =~ /\#\+category\:      food/
+    end
+  end
+
   context "when using `re-org templates`" do 
     before(:each) do
       @cmd = {

data/spec/org_file_spec.rb

@@ -7,7 +7,7 @@ describe ReOrg::OrgFile do
   end
 
   it 'should create date in org format' do
-    date = Time.at(1377411362)
+    date = Time.at(1377411362).utc
     @org.org_format_date(date).should == '[2013-08-25 Sun]'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: re-org
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
-  requirement: &70351242424800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351242424800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: org-ruby
-  requirement: &70351242424380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351242424380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An Org mode file organizer
 email:
 - waldemar.quevedo@gmail.com
@@ -81,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Instead of having tons of sparsed Org mode files everywhere, this project
@@ -91,3 +101,4 @@ test_files:
 - spec/command_spec.rb
 - spec/org_file_spec.rb
 - spec/spec_helper.rb
+has_rdoc: