alula 0.0.1 → 0.1.0

data/Rakefile

@@ -1,2 +1,6 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+# Versioning
+require 'rake/version_task'
+Rake::VersionTask.new

data/VERSION

@@ -0,0 +1 @@
+0.1.0

data/alula.gemspec

@@ -16,12 +16,17 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Alula::VERSION
   
-  gem.add_dependency 'jekyll'
-  gem.add_dependency 'sprockets'
-  gem.add_dependency 'thor'
-  gem.add_dependency 'rmagick'
-  gem.add_dependency 'sass'
-  gem.add_dependency 'coffee-script'
-  gem.add_dependency 'uglifier'
-  gem.add_dependency 'activesupport'
+  gem.add_dependency 'jekyll', '~> 0.11.2'
+  gem.add_dependency 'sprockets', '~> 2.4.0'
+  gem.add_dependency 'thor', '~> 0.14.6'
+  gem.add_dependency 'rmagick', '~> 2.13.1'
+  gem.add_dependency 'sass', '~> 3.1.15'
+  gem.add_dependency 'coffee-script', '~> 2.2.0'
+  gem.add_dependency 'uglifier', '~> 1.2.4'
+  gem.add_dependency 'front-compiler', '~> 1.1.0'
+  gem.add_dependency 'activesupport', '~> 3.2.3'
+  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

@@ -2,6 +2,11 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'alula/cli'
+# Are we in Alula blog
+if File.exists?("Rakefile") and File.read("Rakefile") =~ /alula/
+  require 'bundler/setup'
+  Bundler.require(:default)
+end  
 
+require 'alula/cli'
 Alula::CLI.start

data/lib/alula/cli.rb

@@ -15,35 +15,40 @@ module Alula
         empty_directory File.join(path, dir)
       end
       
-      # Create Gemfile
-      create_file File.join(path, "Gemfile") do
-        <<EOF
-source :rubygems
-
-gem "alula"
-gem "alula-plugins"
-gem "alula-themes"
-EOF
-      end
-      
-      # Create Rakefile
-      create_file File.join(path, "Rakefile")  do
-        <<EOF
-require 'rubygems'
-require "bundler/setup"
-Bundler.require(:default)
-
-require 'alula/tasks'
-EOF
+      # Insert templates
+      %w{Gemfile config.yml}.each do |tpl|
+        template "#{tpl}.erb" File.join(path, tpl)
       end
       
-      # Create config
-      template "config.yml.erb", File.join(path, "config.yml")
-      
       # Initialize system
       inside File.join(path) do
         run "bundle install"
       end
     end
+    
+    desc "generate", "Generates blog"
+    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."
+    def generate
+      site = Alula::Site.new("asset_compress" => (!options["development"] or options["production"]))
+      site.generate
+    end
+
+    desc "preview", "Preview blog"
+    method_option :development, :type => :boolean, :default => true,
+      :desc => "Preview site using development settings. Keeps all assets and HTML uncompressed."
+    method_option :production, :type => :boolean, :default => false,
+      :desc => "Preview site suing production settings. Compresses all assets and HTML."
+    def preview
+      site = Alula::Site.new("asset_compress" => (!options["development"] or options["production"]))
+      site.preview
+    end
+    
+    desc "attach POST ASSET", "Attached given asset, photo or video to given post"
+    def attach(post, asset)
+      puts "Hii haa"
+    end
   end
 end

data/lib/alula/compressors.rb

@@ -1,5 +1,6 @@
 require 'sass'
 require 'uglifier'
+require 'front-compiler'
 
 module Alula
   module Compressors
@@ -19,7 +20,15 @@ module Alula
     
     class JSCompressor
       def compress(content)
-        Uglifier.new.compress(content)
+        @@compressor ||= Uglifier.new
+        @@compressor.compress(content)
+      end
+    end
+    
+    module HTMLCompressor
+      def output_with_compression
+        @@compressor ||= FrontCompiler.new
+        @@compressor.compact_html(@output)
       end
     end
   end

data/lib/alula/plugins/assets.rb

@@ -40,7 +40,14 @@ module Alula
       default "scripts"
       
       def content(asset)
-        "<script type=\"text/javascript\" src=\"#{asset}\"></script>"
+        if File.size(File.join("public", asset)) < 10
+          content = File.read(File.join("public", asset))
+          unless content == ";"
+            "<script type=\"text/javascript\">#{content}</script>"
+          end
+        else
+          "<script type=\"text/javascript\" src=\"#{asset}\"></script>"
+        end
       end
     end
     

data/lib/alula/rake_tasks.rb

@@ -25,6 +25,18 @@ module Alula
         site = Alula::Site.new
         site.preview
       end
+      
+      desc "Generate blog (deployment)"
+      task :publish do
+        site = Alula::Site.new("asset_compress" => true)
+        site.generate
+      end
+      
+      desc "Starts preview server in deployment mode"
+      task :preview_publish do
+        site = Alula::Site.new("asset_compress" => true)
+        site.preview
+      end
     end
   end
 end

data/lib/alula/site.rb

@@ -3,6 +3,7 @@ require 'jekyll'
 require 'sprockets'
 require 'RMagick'
 require 'active_support/inflector/methods'
+require 'progressbar'
 
 require 'alula/theme'
 require 'alula/plugin'
@@ -19,9 +20,9 @@ module Alula
     
     attr_reader :config, :jekyll
     
-    def initialize
+    def initialize(override = {})
       # Load configuration
-      @config = YAML.load_file('config.yml')
+      @config = YAML.load_file('config.yml').deep_merge(override)
       
       # Register local theme path
       Alula::Theme.register("themes")
@@ -57,6 +58,12 @@ module Alula
       if @config['asset_compress']
         @sprockets.css_compressor = Alula::Compressors::CSSCompressor.new
         @sprockets.js_compressor = Alula::Compressors::JSCompressor.new
+        
+        [Jekyll::Post, Jekyll::Page].each do |klass|
+          klass.send(:include, Alula::Compressors::HTMLCompressor)
+          klass.send(:alias_method, :output_without_compression, :output)
+          klass.send(:alias_method, :output, :output_with_compression)
+        end
       end
 
       # Add theme to asset paths
@@ -163,23 +170,22 @@ module Alula
       originals_path = File.join("attachments", "_originals")
       thumbnails_path = File.join("attachments", "_thumbnails")
       
-      Dir[File.join(originals_path, "**", "*")]
+      assets = Dir[File.join(originals_path, "**", "*")]
         .select {|f| File.file?(f) }
         .collect {|f| File.join(f.split("/")[2..-1])}
-        .each do |original|
-          print "#{original}: "
-          
-          unless File.exists?(File.join(thumbnails_path, original))
-            image = Magick::Image.read(File.join(originals_path, original)).first
-            image.crop_resized!(width, height, Magick::NorthGravity)
-            FileUtils.mkdir_p File.dirname(File.join(thumbnails_path, original))
-            image.write(File.join(thumbnails_path, original))
-            
-            puts "generated."
-          else
-            puts "exists."
-          end
+      pb = ProgressBar.new "Assets", assets.count
+      
+      assets.each do |original|
+        unless File.exists?(File.join(thumbnails_path, original))
+          image = Magick::Image.read(File.join(originals_path, original)).first
+          image.crop_resized!(width, height, Magick::NorthGravity)
+          FileUtils.mkdir_p File.dirname(File.join(thumbnails_path, original))
+          image.write(File.join(thumbnails_path, original))
+        end
+        pb.inc
       end
+      
+      pb.finish
     end
     
     def compile
@@ -196,19 +202,15 @@ module Alula
       
       # Package javascript
       File.open(File.join("_tmp", "assets", "scripts.js"), "w") do |tf|
-        tf.puts "/*"
-        tf.puts " *=require #{@config["theme"]}"
+        tf.puts "//=require #{@config["theme"]}"
         # Plugins
-        @config["plugins"].each { |plugin, opts| tf.puts " *=require #{plugin}" }
-        tf.puts " */"
+        @config["plugins"].each { |plugin, opts| tf.puts "//=require #{plugin}" }
       end
 
       File.open(File.join("_tmp", "assets", "scripts_body.js"), "w") do |tf|
-        tf.puts "/*"
-        tf.puts " *=require #{@config["theme"]}_body"
+        tf.puts "//=require #{@config["theme"]}_body"
         # Plugins
-        @config["plugins"].each { |plugin, opts| tf.puts " *=require #{plugin}_body" }
-        tf.puts " */"
+        @config["plugins"].each { |plugin, opts| tf.puts "//=require #{plugin}_body" }
       end
       
       
@@ -231,6 +233,11 @@ module Alula
       
       # Inject our manifest to jekyll
       @jekyll.config["manifest"] = @manifest
+      
+      # Cleanup
+      %w{styles.css scripts.js scripts_body.js}.each do |f|
+        FileUtils.rm(File.join("_tmp", "assets", f))
+      end
     end
     
     def process

data/lib/alula/version.rb

@@ -1,3 +1,3 @@
 module Alula
-  VERSION = "0.0.1"
-end
+  VERSION = File.read(File.join(File.dirname(__FILE__), %w{.. .. VERSION})).strip
+end

data/template/Gemfile.erb

@@ -0,0 +1,5 @@
+source :rubygems
+
+gem "alula"
+gem "alula-plugins"
+gem "alula-themes"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alula
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,92 +13,136 @@ date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &70211932354580 !ruby/object:Gem::Requirement
+  requirement: &70325892298600 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.2
   type: :runtime
   prerelease: false
-  version_requirements: *70211932354580
+  version_requirements: *70325892298600
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70211932353820 !ruby/object:Gem::Requirement
+  requirement: &70325892297560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70211932353820
+  version_requirements: *70325892297560
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70211932369740 !ruby/object:Gem::Requirement
+  requirement: &70325892349240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70211932369740
+  version_requirements: *70325892349240
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70211932369100 !ruby/object:Gem::Requirement
+  requirement: &70325892348540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.1
   type: :runtime
   prerelease: false
-  version_requirements: *70211932369100
+  version_requirements: *70325892348540
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70211932368460 !ruby/object:Gem::Requirement
+  requirement: &70325892347940 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.15
   type: :runtime
   prerelease: false
-  version_requirements: *70211932368460
+  version_requirements: *70325892347940
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70211932367840 !ruby/object:Gem::Requirement
+  requirement: &70325892347340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70211932367840
+  version_requirements: *70325892347340
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70211932367220 !ruby/object:Gem::Requirement
+  requirement: &70325892346700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70211932367220
+  version_requirements: *70325892346700
+- !ruby/object:Gem::Dependency
+  name: front-compiler
+  requirement: &70325892346080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70325892346080
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70211932366560 !ruby/object:Gem::Requirement
+  requirement: &70325892345600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *70325892345600
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: &70325892345100 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70211932366560
+  version_requirements: *70325892345100
+- !ruby/object:Gem::Dependency
+  name: version
+  requirement: &70325892344620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *70325892344620
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70325892344100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.8.4
+  type: :development
+  prerelease: false
+  version_requirements: *70325892344100
 description: Alula is a simple tool for creating fast, static blogs easily.
 email:
 - mikko@owlforestry.com
@@ -112,6 +156,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- VERSION
 - alula.gemspec
 - bin/alula
 - lib/alula.rb
@@ -124,6 +169,7 @@ files:
 - lib/alula/tasks.rb
 - lib/alula/theme.rb
 - lib/alula/version.rb
+- template/Gemfile.erb
 - template/config.yml.erb
 - vendor/javascripts/jquery.js
 homepage: http://owlforestry.github.com/alula