alula 0.1.4 → 0.2.0a

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0a

data/alula.gemspec

@@ -29,5 +29,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'ruby-progressbar', '~> 0.0.10'
 
   gem.add_development_dependency 'version', '~> 1.0.0'
-  gem.add_development_dependency 'pry', '~> 0.9.8.4'
 end

data/bin/alula

@@ -4,9 +4,14 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 # Are we in Alula blog
 if File.exists?("Gemfile") and File.read("Gemfile") =~ /alula/
-  require 'bundler/setup'
-  Bundler.require(:default)
-end  
+  # Restart tool from bundle if facing load error (usually older alula already loaded)
+  require 'bundler'
+  begin
+    Bundler.require(:default)
+  rescue LoadError
+    exec "bundle", "exec", "alula", *ARGV
+  end
+end
 
 require 'alula/cli'
 Alula::CLI.start

data/lib/alula/cli.rb

@@ -11,7 +11,7 @@ module Alula
     desc "init [PATH]", "Creates a new aLula blog in given path or current directory"
     def init(path = ".")
       # Create directory structure
-      %w{attachments attachments/_originals attachments/_thumbnails posts}.each do |dir|
+      %w{attachments attachments/_originals attachments/_thumbnails posts pages}.each do |dir|
         empty_directory File.join(path, dir)
       end
       
@@ -30,7 +30,7 @@ module Alula
     method_option :development, :type => :boolean, :default => true,
       :desc => "Generate site using development settings. Keeps all assets and HTML uncompressed."
     method_option :production, :type => :boolean, :default => false,
-      :desc => "Generate site suing production settings. Compresses all assets and HTML."
+      :desc => "Generate site using production settings. Compresses all assets and HTML."
     def generate
       site = Alula::Site.new("asset_compress" => (!options["development"] or options["production"]))
       site.generate
@@ -52,9 +52,10 @@ module Alula
       site.asset_attach(post, assets)
     end
     
-    desc "hello"
-    def hello
-      say "Hello world."
+    desc "clean", "Clean up all generated content"
+    def clean
+      site = Alula::Site.new
+      site.clean
     end
   end
 end

data/lib/alula/site.rb

@@ -29,18 +29,14 @@ module Alula
       Alula::Theme.register("themes")
       
       # Initialize Jekyll
-      options         = Jekyll::DEFAULTS.deep_merge({
-        'source'      => '_tmp',
-        'destination' => 'public',
-        'markdown'    => 'kramdown',
-        
+      options         = Alula::DEFAULTS.deep_merge({
         # Site options
         'title'          => @config["title"],
         'tagline'        => @config["tagline"],
         'author'         => @config["author"],
         'root'           => @config["root"],
-        'asset_path'     => "#{@config["root"]}assets",
-        'permalinks'     => @config["permalinks"],
+        'asset_path'     => File.join(@config["root"], "assets"),
+        'permalink'      => @config["permalink"],
         'paginate'       => @config["paginate"],
         'pagination_dir' => @config["pagination_dir"],
         'excerpt_link'   => @config["excerpt_link"],
@@ -136,13 +132,15 @@ module Alula
         t.join()
     end
     
-    def asset_attach(post, assets)
+    def asset_attach(a_post, assets)
       # Find the post
-      post = find_post(post)
-      post =~ /(?<date>(\d{4}-\d{2}-\d{2}))/
+      post = find_post(a_post) or raise "Cannot find post #{a_post}"
+      
+      /(?<date>(\d{4}-\d{2}-\d{2}))/ =~ post
+      # require 'pry';binding.pry
       date = Time.parse(date)
       
-      width, height = @config["images"].split("x").collect {|i| i.to_i }
+      width, height = @config["images"]["size"].split("x").collect {|i| i.to_i }
       asset_path = File.join(%w{%Y %m %d}.collect{|f| date.strftime(f) })
       file_path = File.join("attachments", "_originals", asset_path)
       FileUtils.mkdir_p(file_path)
@@ -156,34 +154,41 @@ module Alula
       assets.each do |asset|
         asset_ext = File.extname(asset).downcase
         asset_base = File.basename(asset).downcase
-        asset_plain = File.basename(asset, asset_ext)
+        asset_plain = File.basename(asset, asset_ext).to_url
         
         if image_types.include?(asset_ext)
           img = Magick::Image.read(asset).first
+          orig_w, orig_h = img.columns, img.rows
+          
           img_normal = img.resize_to_fit(width, height)
-          img_normal.write(File.join(file_path, asset_base))
+          img_normal.write(File.join(file_path, "#{asset_plain}#{asset_ext}"))
           img_normal = nil
           
-          img_retina = img.resize_to_fit(width * 2, height * 2)
-          retina_fname = File.join(file_path, "#{asset_plain}_2x#{asset_ext}")
-          img_retina.write(retina_fname)
-          img_retina = nil
+          if (@config["images"]["retina"] and (orig_w > width * 2) or (orig_h > height * 2))
+            img_retina = img.resize_to_fit(width * 2, height * 2)
+            retina_fname = File.join(file_path, "#{asset_plain}_2x#{asset_ext}")
+            img_retina.write(retina_fname)
+            img_retina = nil
+          end
           
           processed << File.join(asset_path, asset_base)
           
           if @config["plugins"].keys.include?("lightbox")
-            post_io.puts "{% lightbox #{File.join(asset_path, asset_base)} %}"
+            post_io.puts "{% lightbox #{File.join(asset_path, "#{asset_plain}#{asset_ext}")} %}"
           else
-            post_io.puts "{% image #{File.join("_originals", asset_path, asset_base)} %}"
+            post_io.puts "{% image #{File.join("_originals", asset_path, "#{asset_plain}#{asset_ext}")} %}"
           end
-          
-          puts "Asset generated: #{asset_base} (normal, retina)"
         end
       end
       
       post_io.close
     end
     
+    def clean
+      cleanup
+      FileUtils.rm_rf(Dir[File.join("attachments", "_thumbnails", "*")])
+    end
+    
     private
     def find_post(post)
       if File.exists?(post)
@@ -193,7 +198,7 @@ module Alula
       else
         # Try to find by title
         title = post.to_url
-        posts = Dir[File.join("posts", "*")].select { |p| p =~ /title/ }
+        posts = Dir[File.join("posts", "*")].select { |p| p =~ /#{title}/ }
         if posts.count == 1
           return posts.first
         end
@@ -222,13 +227,16 @@ module Alula
       FileUtils.mkdir_p File.join("_tmp", "_posts")
       FileUtils.cp_r Dir[File.join("posts", "*")], File.join("_tmp", "_posts")
       
+      # Copy pages
+      FileUtils.cp_r Dir[File.join("pages", "**", "*")], File.join("_tmp")
+      
       FileUtils.mkdir_p File.join("_tmp", "assets")
     end
     
     def assetgen
       puts "==> Generating assets"
       
-      width, height = @config["thumbnails"].split("x").collect {|i| i.to_i }
+      width, height = @config["images"]["thumbnails"].split("x").collect {|i| i.to_i }
       
       # Get all attachements
       originals_path = File.join("attachments", "_originals")
@@ -320,4 +328,12 @@ module Alula
       FileUtils.rm_rf "_tmp"
     end
   end
+  
+  DEFAULTS = Jekyll::DEFAULTS.deep_merge({
+    'source'      => '_tmp',
+    'destination' => 'public',
+    'markdown'    => 'kramdown',
+    
+    'pagination_dir' => '/page/',
+  })
 end

data/template/config.yml.erb

@@ -12,14 +12,17 @@ tagline: BLOG TAGLINE
 # Chosed theme
 theme: minimal
 
-# Thumbnail size (width x height)
-thumbnails: 300x300
+# Options for image settings
+images:
+  size: 800x600			# Resize photos to this size
+  thumbnails: 300x300	# # Thumbnail size (width x height)
+  retina: true			# Generate photos for retina displays
 
 # Root URL, if you host blog in directory, fix this according
 root: /
 
 # Permalinks style
-permalinks: /:year/:month/:title
+permalink: /:year/:month/:title
 
 # Posts per page on the blog index
 paginate: 10

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: alula
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.2.0a
+  prerelease: 5
 platform: ruby
 authors:
 - Mikko Kokkonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-06 00:00:00.000000000 Z
+date: 2012-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &70331726160920 !ruby/object:Gem::Requirement
+  requirement: &70182215769900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.11.2
   type: :runtime
   prerelease: false
-  version_requirements: *70331726160920
+  version_requirements: *70182215769900
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70331726160440 !ruby/object:Gem::Requirement
+  requirement: &70182215769320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70331726160440
+  version_requirements: *70182215769320
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70331726176320 !ruby/object:Gem::Requirement
+  requirement: &70182215768740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70331726176320
+  version_requirements: *70182215768740
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70331726175840 !ruby/object:Gem::Requirement
+  requirement: &70182215784460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.13.1
   type: :runtime
   prerelease: false
-  version_requirements: *70331726175840
+  version_requirements: *70182215784460
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70331726175360 !ruby/object:Gem::Requirement
+  requirement: &70182215783720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 3.1.15
   type: :runtime
   prerelease: false
-  version_requirements: *70331726175360
+  version_requirements: *70182215783720
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70331726174880 !ruby/object:Gem::Requirement
+  requirement: &70182215783040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70331726174880
+  version_requirements: *70182215783040
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70331726174360 !ruby/object:Gem::Requirement
+  requirement: &70182215782320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70331726174360
+  version_requirements: *70182215782320
 - !ruby/object:Gem::Dependency
   name: front-compiler
-  requirement: &70331726173900 !ruby/object:Gem::Requirement
+  requirement: &70182215781660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70331726173900
+  version_requirements: *70182215781660
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70331726173440 !ruby/object:Gem::Requirement
+  requirement: &70182215780960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70331726173440
+  version_requirements: *70182215780960
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70331726172960 !ruby/object:Gem::Requirement
+  requirement: &70182215780280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70331726172960
+  version_requirements: *70182215780280
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
-  requirement: &70331726172460 !ruby/object:Gem::Requirement
+  requirement: &70182215779320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70331726172460
+  version_requirements: *70182215779320
 - !ruby/object:Gem::Dependency
   name: version
-  requirement: &70331726171940 !ruby/object:Gem::Requirement
+  requirement: &70182215778200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,18 +142,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70331726171940
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: &70331726171460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.8.4
-  type: :development
-  prerelease: false
-  version_requirements: *70331726171460
+  version_requirements: *70182215778200
 description: Alula is a simple tool for creating fast, static blogs easily.
 email:
 - mikko@owlforestry.com
@@ -198,9 +187,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17