amiba 0.0.7 → 0.0.8

data/lib/amiba/all.rb

@@ -3,7 +3,7 @@ require 'haml'
 require 'active_support/all'
 require 'active_model'
 require 'i18n'
-require 'rdiscount'
+require 'redcarpet'
 
 require 'amiba/core_ext/file'
 require 'amiba/core_ext/symbol'

data/lib/amiba/repo.rb

@@ -26,5 +26,8 @@ module Amiba
       filenames.map {|fn| last_commit_date(fn)}
     end
     
+    def push(remote=nil,branch=nil,args={}) 
+      repo.git.push(args,remote,branch)
+    end
   end
 end

data/lib/amiba/site.rb

@@ -9,8 +9,10 @@ module Amiba
 
       namespace :"site:preview"
       class_option :port, :default => 4321
+      # class_option :drafts, :default => false
 
       def create
+        # invoke Amiba::Site::Generate, [], :drafts => options[:drafts]
         invoke Amiba::Site::Generate
       end
 
@@ -34,6 +36,7 @@ module Amiba
 
     class S3Upload < Thor::Group
       include Amiba::Generator
+      include Amiba::Repo
 
       namespace :"site:upload:s3"
 
@@ -73,6 +76,11 @@ module Amiba
         end
       end
 
+      def git_push
+        push
+        say_status "Changes pushed to git", "", :green
+      end
+
       def complete
         host = "http://#{bucket}.s3-website-#{Fog.credentials[:region]}.amazonaws.com/"
         say_status "Available at", host, :green
@@ -93,6 +101,7 @@ module Amiba
       include Amiba::Generator
 
       namespace :"site:generate"
+      class_option :drafts, :default => false
 
       def self.source_root
         Dir.pwd
@@ -142,7 +151,7 @@ module Amiba
       end
     
       def build_entries
-        Amiba::Source::Entry.all.each do |entry|
+        Amiba::Source::Entry.send(state).each do |entry|
           build_page entry
         end
       end
@@ -151,7 +160,7 @@ module Amiba
         Dir.glob('pages/**/[^_]*').each do |page_file|
           next if File.directory? page_file
           page = Amiba::Source::Page.new(File.relpath(page_file, "pages"))
-          next unless page.state == "published"
+          next unless (page.state == "published" || options[:drafts])
           build_page page
         end
       end
@@ -177,13 +186,21 @@ module Amiba
               Tilt.new(feed.filename).render(Amiba::Scope.new(feed), :xml => Builder::XmlMarkup.new)
             end
           rescue
-            puts "Unable to process #{feed.name}, skipping" 
+            say_status "Failed", "Unable to process #{feed.name}: #{$!}, skipping", :red
           end
         end
       end
 
       private
 
+      def state
+        if options[:drafts]
+          :any
+        else
+          :published
+        end
+      end
+
       def build_layout(page)
         layout = Amiba::Source::Layout.new(page.layout)
         return layout if File.exists? layout.staged_filename
@@ -199,7 +216,7 @@ module Amiba
             Tilt.new(layout.staged_filename).render(Amiba::Scope.new(page))
           end
         rescue
-          puts "Unable to process #{page.name}: #{$!}, skipping" 
+          say_status "Failed", "Unable to process #{page.name}: #{$!}, skipping", :red
         end
       end
 

metadata

@@ -2,15 +2,16 @@
 name: amiba
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Steven Mohapi-Banks
+- Thom May
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 +01:00
+date: 2011-06-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +33,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.3.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -80,14 +81,14 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  name: redcarpet
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.6.8
+        version: "0"
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -98,7 +99,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -159,6 +160,7 @@ dependencies:
 description: Description TBD
 email: 
 - s.mohapi-banks@digital-science.com
+- thom@digital-science.com
 executables: 
 - amiba
 extensions: []