diary 0.1.5 → 0.2.0

data/.gitignore

@@ -1,22 +1,3 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-.document
+pkg/*
+*.gem
+.bundle

data/Gemfile

@@ -0,0 +1,4 @@
+source :gemcutter
+
+# Specify your gem's dependencies in diary.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: .
+  specs:
+    diary (0.2.0)
+      activesupport (>= 3.0.0)
+      bluecloth (>= 2.0.11)
+      sinatra (>= 1.1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.3)
+    bluecloth (2.0.11)
+    rack (1.2.1)
+    sinatra (1.2.0)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    tilt (1.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 3.0.0)
+  bluecloth (>= 2.0.11)
+  bundler (>= 1.0.0.rc.6)
+  diary!
+  sinatra (>= 1.1.0)

data/Rakefile

@@ -1,20 +1,2 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "diary"
-    gem.summary = "Dead Simple, Static Blog Generator"
-    
-    gem.email = "robin@clart.me"
-    gem.homepage = "http://github.com/robinclart/diary"
-    gem.authors = ["Robin Clart"]
-    
-    gem.add_dependency('liquid', '>= 2.0.0')
-    gem.add_dependency('bluecloth', '>= 2.0.7')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/bin/diary

@@ -1,43 +1,4 @@
 #!/usr/bin/env ruby
-
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
 require 'diary'
-require 'diary/cli'
-
-options = Diary::CLI.parse(ARGV)
-# Diary.config(options)
 
-case ARGV.size
-when 1
-  case ARGV[0]
-  when "compile"
-    Diary::Site.compile(options.force)
-  when "init"
-    Diary::Site.new(options)
-  else
-    puts "Invalid option. Run `diary --help`."
-  end
-when 2
-  case ARGV[0]
-  when "draft"
-    Draft.new(ARGV[1])
-  when "page"
-    Page.new(ARGV[1])
-  when "post"
-    Post.new(ARGV[1])
-  when "publish"
-    Draft.new(ARGV[1]).publish
-  else
-    puts "Invalid option. Run `diary --help`."
-  end
-when 3
-  case ARGV[0]
-  when "publish"
-    Draft.new(ARGV[1]).publish(ARGV[2])
-  else
-    puts "Invalid option. Run `diary --help`."
-  end
-else
-  puts "Invalid option(s). Run `diary --help`."
-end
+Diary::CLI.command(*ARGV)

data/diary.gemspec

@@ -1,67 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+require File.expand_path("../lib/diary/version", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{diary}
-  s.version = "0.1.5"
+  s.name        = "diary"
+  s.version     = Diary::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Robin Clart"]
+  s.email       = ["robin@charlin.be"]
+  s.homepage    = "http://rubygems.org/gems/diary"
+  s.summary     = "Another static blog generator"
+  s.description = "Diary makes it easy to maintain a file based website with template blog posts and pages."
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Robin Clart"]
-  s.date = %q{2010-07-02}
-  s.default_executable = %q{diary}
-  s.email = %q{robin@clart.me}
-  s.executables = ["diary"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/diary",
-     "diary.gemspec",
-     "lib/diary.rb",
-     "lib/diary/cli.rb",
-     "lib/diary/draft.rb",
-     "lib/diary/item.rb",
-     "lib/diary/message.rb",
-     "lib/diary/output.rb",
-     "lib/diary/page.rb",
-     "lib/diary/post.rb",
-     "lib/diary/site.rb",
-     "lib/diary/template.rb",
-     "test/helper.rb",
-     "test/test_diary.rb"
-  ]
-  s.homepage = %q{http://github.com/robinclart/diary}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Dead Simple, Static Blog Generator}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_diary.rb"
-  ]
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project         = "diary"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency "activesupport", ">= 3.0.0"
+  s.add_dependency "bluecloth", ">= 2.0.11"
+  s.add_dependency "sinatra", ">= 1.1.0"
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<liquid>, [">= 2.0.0"])
-      s.add_runtime_dependency(%q<bluecloth>, [">= 2.0.7"])
-    else
-      s.add_dependency(%q<liquid>, [">= 2.0.0"])
-      s.add_dependency(%q<bluecloth>, [">= 2.0.7"])
-    end
-  else
-    s.add_dependency(%q<liquid>, [">= 2.0.0"])
-    s.add_dependency(%q<bluecloth>, [">= 2.0.7"])
-  end
-end
+  s.add_development_dependency "bundler", ">= 1.0.0.rc.6"
 
+  s.files        = `git ls-files`.split("\n")
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.require_path = 'lib'
+end

data/lib/diary.rb

@@ -1,30 +1,33 @@
-$:.unshift File.dirname(__FILE__)
-
-# rubygems
-require 'rubygems'
-
-# stdlib
 require 'fileutils'
 require 'date'
 require 'yaml'
 require 'ostruct'
+require 'singleton'
+require 'erb'
 
-# third party
-require 'liquid'
+require 'active_support/inflector'
 require 'bluecloth'
 
-# internals
-require 'diary/message'
-require 'diary/site'
-require 'diary/template'
-require 'diary/output'
-require 'diary/item'
-require 'diary/draft'
-require 'diary/page'
-require 'diary/post'
-
 module Diary
-  def self.version
-    File.read(File.expand_path("../../VERSION", __FILE__))
+  autoload :CLI,        "diary/cli"
+  autoload :Message,    "diary/message"
+  autoload :Snippet,    "diary/snippet"
+  autoload :VERSION,    "diary/version"
+
+  module Item
+    autoload :Base,       "diary/item/base"
+    autoload :Data,       "diary/item/data"
+    autoload :Template,   "diary/item/template"
+    autoload :Url,        "diary/item/url"
+    autoload :Snippet,    "diary/item/snippet"
+    autoload :Output,     "diary/item/output"
+    autoload :Creator,    "diary/item/creator"
+    autoload :Finder,     "diary/item/finder"
   end
+
+  extend Message::Shorthand
+end
+
+Dir["#{File.dirname(__FILE__)}/diary/items/*.rb"].sort.each do |path|
+  require "diary/items/#{File.basename(path, '.rb')}"
 end

data/lib/diary/cli.rb

@@ -1,47 +1,9 @@
-require 'optparse'
-
 module Diary
-  class CLI
-    def self.parse(args)
-      # The options specified on the command line will be collected in *options*.
-      # We set default values here.
-      options = OpenStruct.new
-      options.verbose = false
-      options.force = false
-
-      opts = OptionParser.new do |opts|
-        opts.banner = "Usage: diary ACTION [-vf]"
-
-        opts.separator "\nSpecific options:"
-        
-        # Verbose
-        opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-          options.verbose = v
-        end
-        
-        # Force
-        opts.on("-f", "--[no-]force", "Force all items to compile") do |f|
-          options.force = f
-        end
-
-        opts.separator "\nCommon options:"
-
-        # No argument, shows at tail.  This will print an options summary.
-        # Try it and see!
-        opts.on_tail("-h", "--help", "Show this message") do
-          puts opts
-          exit
-        end
-
-        # Another typical switch to print the version.
-        opts.on_tail("--version", "Show version") do
-          puts "diary #{Diary.version}"
-          exit
-        end
-      end
+  module CLI
+    autoload :Parser,     "diary/cli/parser"
+    autoload :Commands,   "diary/cli/commands"
 
-      opts.parse!(args)
-      options
-    end
+    extend Parser
+    extend Commands
   end
 end

data/lib/diary/cli/commands.rb

@@ -0,0 +1,23 @@
+Dir["#{File.dirname(__FILE__)}/commands/*.rb"].sort.each do |path|
+  require "diary/cli/commands/#{File.basename(path, '.rb')}"
+end
+
+module Diary
+  module CLI
+    module Commands
+      def command(*args)
+        options = Diary::CLI.parse(args)
+
+        if args.size == 0
+          return
+        end
+
+        if respond_to?(args.first)
+          self.send(args.shift, args, options)
+        elsif
+          Diary.message :error, "No command found", :red
+        end
+      end
+    end
+  end
+end

data/lib/diary/cli/commands/compile.rb

@@ -0,0 +1,16 @@
+module Diary
+  module CLI
+    module Commands
+      def compile(args, options)
+        if (args.first == "all") or (args.size == 0)
+          Post.all.each { |p| p.output(options.force) }
+          Page.all.each { |p| p.output(options.force) }
+        elsif args.size >= 2
+          const_get(args.shift.capitalize).find(args.first).output(options.force)
+        else
+          const_get(args.shift.capitalize).all.each { |p| p.output(options.force) }
+        end
+      end
+    end
+  end
+end

data/lib/diary/cli/commands/init.rb

@@ -0,0 +1,40 @@
+module Diary
+  module CLI
+    module Commands
+      def init(args, options)
+        # Create directories
+        %w{ templates posts pages snippets public }.each do |directory|
+          create_dir directory
+        end
+
+        # Create files
+        create_file "templates/index.html.erb", "<%= content %>"
+        create_file "config.yml", "sync:\n  user: \n  server: \n  path: \n"
+      end
+
+      private
+
+      def create_dir(path)
+        unless File.exists?(path)
+          FileUtils.mkdir_p(path)
+
+          Diary.message :create, path, :green
+        else
+          Diary.message :exist, path, :yellow
+        end
+      end
+
+      def create_file(path, content)
+        unless File.exists?(path)
+          f = File.new(path, "w+")
+          f.puts(content)
+          f.close
+
+          Diary.message :create, path, :green
+        else
+          Diary.message :exist, path, :yellow
+        end
+      end
+    end
+  end
+end

data/lib/diary/cli/commands/new_item.rb

@@ -0,0 +1,9 @@
+module Diary
+  module CLI
+    module Commands
+      def new(args, options)
+        const_get(args.shift.capitalize).create(args.first)
+      end
+    end
+  end
+end

data/lib/diary/cli/commands/server.rb

@@ -0,0 +1,13 @@
+module Diary
+  module CLI
+    module Commands
+      def server(args, options)
+        Diary.message :start, "Diary server is starting...", :green
+        `ruby #{File.expand_path("../../../server.rb", __FILE__)}`
+      rescue Interrupt
+        Diary.message :close, "Diary server is closing...", :red
+        sleep(2)
+      end
+    end
+  end
+end

data/lib/diary/cli/commands/sync.rb

@@ -0,0 +1,20 @@
+module Diary
+  module CLI
+    module Commands
+      def sync(args, options)
+        Diary.message :sync, sync_path, :magenta
+        `rsync --verbose  --progress --stats --compress --recursive --times --perms --links --delete --exclude "*bak" ./public/* #{sync_path}`
+      end
+
+      private
+
+      def sync_path
+        "#{sync_config.user}@#{sync_config.server}:#{sync_config.path}"
+      end
+
+      def sync_config
+        OpenStruct.new(YAML.load_file("config.yml")["sync"]) if File.exists?("config.yml")
+      end
+    end
+  end
+end