awestruct 0.4.4 → 0.4.5

data/bin/awestruct

@@ -5,4 +5,7 @@ $: << File.dirname(__FILE__) + '/../lib'
 require 'rubygems'
 require 'awestruct/cli/invoker'
 
-Awestruct::CLI::Invoker.new( ARGV ).invoke!
+invoker = Awestruct::CLI::Invoker.new( ARGV )
+invoker.invoke!
+
+invoker.success ? exit(0) : exit(-1)

data/lib/awestruct/cli/generate.rb

@@ -20,6 +20,7 @@ module Awestruct
         rescue =>e
           puts e
           puts e.backtrace
+          return false
         end
       end
     end

data/lib/awestruct/cli/init.rb

@@ -11,6 +11,7 @@ module Awestruct
         mkdir( '_ext' )
         copy_file( '_ext/pipeline.rb', File.join( File.dirname(__FILE__), '/../frameworks/base_pipeline.rb' ) )
         mkdir( 'stylesheets' )
+        touch_file( '.awestruct_ignore' )
       }
 
       def initialize(dir=Dir.pwd,framework='compass',scaffold=true)

data/lib/awestruct/cli/invoker.rb

@@ -16,6 +16,7 @@ module Awestruct
 
       attr_reader :config
       attr_reader :profile
+      attr_reader :success
 
       def initialize(*options)
         options = options.flatten
@@ -26,6 +27,7 @@ module Awestruct
         end
         @threads = []
         @profile = nil
+        @success = true
       end
 
       def invoke!
@@ -42,6 +44,7 @@ module Awestruct
         invoke_auto()      if ( options.auto )
 
         wait_for_completion()
+        success
       end
 
       def load_profile()
@@ -90,7 +93,7 @@ module Awestruct
       end
 
       def invoke_generate()
-        Awestruct::CLI::Generate.new( config, profile, options.base_url, 'http://localhost:4242', options.force ).run
+        @success = Awestruct::CLI::Generate.new( config, options.profile, options.base_url, 'http://localhost:4242', options.force ).run
       end
 
       def invoke_deploy()

data/lib/awestruct/cli/options.rb

@@ -4,6 +4,7 @@ require 'awestruct/version'
 
 module Awestruct
   module CLI
+
     class Options
 
       attr_accessor :generate

data/lib/awestruct/context_helper.rb

@@ -41,7 +41,7 @@ module Awestruct
       doc = Hpricot( text )
 
       doc.search( "//a" ).each do |a|
-        a['href'] = fix_url( base_url, a['href'] )
+        a['href'] = fix_url( base_url, a['href'] ) if a['href']
       end
       doc.search( "//link" ).each do |link|
         link['href'] = fix_url( base_url, link['href'] )

data/lib/awestruct/deploy/github_pages_deploy.rb

@@ -1,4 +1,5 @@
 require 'awestruct/deployers'
+require 'git'
 
 module Awestruct
   module Deploy
@@ -15,7 +16,7 @@ module Awestruct
 
       private
       def git
-        @git ||= Git.open('.')
+        @git ||= ::Git.open('.')
       end
 
       def publish_site
@@ -34,7 +35,7 @@ module Awestruct
           git.add(".")
           begin
             git.commit("Published #{@branch} to GitHub pages.")
-          rescue Git::GitExecuteError => e
+          rescue ::Git::GitExecuteError => e
             $stderr.puts "Can't commit. #{e}."
           end
         end

data/lib/awestruct/deploy/rsync_deploy.rb

@@ -7,13 +7,13 @@ module Awestruct
     class RSyncDeploy
 
       def initialize(site_config, deploy_config)
-        @site_path = File.join( site_config.output_dir, '/' )
+        @site_path = File.join( site_config.output_dir, '/' ).gsub(/^\w:\//, '/')
         @host      = deploy_config['host']
         @path      = File.join( deploy_config['path'], '/' )
       end
 
       def run
-        cmd = "rsync -r -l -i --no-p --no-g --chmod=Dg+s,ug+w --delete #{@site_path} #{@host}:#{@path}"
+        cmd = "rsync -r -l -i --no-p --no-g --chmod=Dg+sx,ug+rw --delete #{@site_path} #{@host}:#{@path}"
         Open3.popen3( cmd ) do |stdin, stdout, stderr|
           stdin.close
           threads = []

data/lib/awestruct/handlers/base_handler.rb

@@ -1,4 +1,4 @@
-
+require 'awestruct/handler_chain'
 require 'open3'
 
 module Awestruct

data/lib/awestruct/handlers/erb_handler.rb

@@ -1,4 +1,3 @@
-
 require 'awestruct/handlers/base_handler'
 require 'awestruct/handlers/file_handler'
 require 'awestruct/handlers/front_matter_handler'

data/lib/awestruct/version.rb

@@ -1,4 +1,4 @@
 
 module Awestruct
-  VERSION='0.4.4'
+  VERSION='0.4.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 -04:00
-default_executable: 
+date: 2012-07-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70224754730200 !ruby/object:Gem::Requirement
+  requirement: &70315235798680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 0.8.6
   type: :runtime
   prerelease: false
-  version_requirements: *70224754730200
+  version_requirements: *70315235798680
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70224754729600 !ruby/object:Gem::Requirement
+  requirement: &70315235798060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70224754729600
+  version_requirements: *70315235798060
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70224754728920 !ruby/object:Gem::Requirement
+  requirement: &70315235797480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 3.1.15
   type: :runtime
   prerelease: false
-  version_requirements: *70224754728920
+  version_requirements: *70315235797480
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70224754728280 !ruby/object:Gem::Requirement
+  requirement: &70315235796900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +54,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70224754728280
+  version_requirements: *70315235796900
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70224754727620 !ruby/object:Gem::Requirement
+  requirement: &70315235796300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: 4.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70224754727620
+  version_requirements: *70315235796300
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70224754727000 !ruby/object:Gem::Requirement
+  requirement: &70315235795660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +76,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70224754727000
+  version_requirements: *70315235795660
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70224754726000 !ruby/object:Gem::Requirement
+  requirement: &70315235795100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +87,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70224754726000
+  version_requirements: *70315235795100
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70224754725220 !ruby/object:Gem::Requirement
+  requirement: &70315235794540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +98,10 @@ dependencies:
         version: 0.12.1
   type: :runtime
   prerelease: false
-  version_requirements: *70224754725220
+  version_requirements: *70315235794540
 - !ruby/object:Gem::Dependency
   name: compass-960-plugin
-  requirement: &70224754724420 !ruby/object:Gem::Requirement
+  requirement: &70315235793960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +109,10 @@ dependencies:
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70224754724420
+  version_requirements: *70315235793960
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
-  requirement: &70224754723840 !ruby/object:Gem::Requirement
+  requirement: &70315235793400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +120,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70224754723840
+  version_requirements: *70315235793400
 - !ruby/object:Gem::Dependency
   name: org-ruby
-  requirement: &70224754723200 !ruby/object:Gem::Requirement
+  requirement: &70315235792840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +131,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70224754723200
+  version_requirements: *70315235792840
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70224754722620 !ruby/object:Gem::Requirement
+  requirement: &70315235792240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +142,10 @@ dependencies:
         version: 1.6.6
   type: :runtime
   prerelease: false
-  version_requirements: *70224754722620
+  version_requirements: *70315235792240
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70224754721880 !ruby/object:Gem::Requirement
+  requirement: &70315235791640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +153,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70224754721880
+  version_requirements: *70315235791640
 - !ruby/object:Gem::Dependency
   name: listen
-  requirement: &70224754721200 !ruby/object:Gem::Requirement
+  requirement: &70315235778580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +164,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70224754721200
+  version_requirements: *70315235778580
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70224754720680 !ruby/object:Gem::Requirement
+  requirement: &70315235778100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +175,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70224754720680
+  version_requirements: *70315235778100
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70224754719680 !ruby/object:Gem::Requirement
+  requirement: &70315235777640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,40 +186,7 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *70224754719680
-- !ruby/object:Gem::Dependency
-  name: hashery
-  requirement: &70224754704220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :development
-  prerelease: false
-  version_requirements: *70224754704220
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70224754702240 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.9'
-  type: :development
-  prerelease: false
-  version_requirements: *70224754702240
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70224754700840 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: *70224754700840
+  version_requirements: *70315235777640
 description: Awestruct is a framework for creating static HTML sites.
 email: bob@mcwhirter.org
 executables:
@@ -310,7 +276,6 @@ files:
 - lib/awestruct/frameworks/bootstrap/base_index.html.haml
 - lib/awestruct/frameworks/bootstrap/base_layout.html.haml
 - bin/awestruct
-has_rdoc: true
 homepage: http://awestruct.org
 licenses: []
 post_install_message: 
@@ -325,7 +290,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1329152766291393664
+      hash: 458356617094483761
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -334,10 +299,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1329152766291393664
+      hash: 458356617094483761
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Static site-baking utility