awestruct 0.5.3 → 0.5.4.beta1

data/lib/awestruct/cli/init.rb

@@ -1,4 +1,5 @@
 require 'awestruct/cli/manifest'
+require 'awestruct/cli/options'
 require 'sass'
 require 'sass/plugin'
 
@@ -11,61 +12,61 @@ module Awestruct
       end
 
       BASE_MANIFEST = Manifest.new {
-        mkdir( '_config' )
-        mkdir( '_layouts' )
-        mkdir( '_ext' )
-        copy_file( '_ext/pipeline.rb', Init.framework_path( 'base_pipeline.rb' ) )
-        copy_file( '.awestruct_ignore', Init.framework_path( 'base_awestruct_ignore' ) )
-        copy_file( 'Rakefile', Init.framework_path( 'base_Rakefile' ) )
-        copy_file( 'Gemfile', Init.framework_path( 'base_Gemfile' ) )
-        mkdir( 'stylesheets' )
+        mkdir('_config')
+        mkdir('_layouts')
+        mkdir('_ext')
+        copy_file('_ext/pipeline.rb', Init.framework_path('base_pipeline.rb'))
+        copy_file('.awestruct_ignore', Init.framework_path('base_awestruct_ignore'))
+        copy_file('Rakefile', Init.framework_path('base_Rakefile'))
+        copy_file('Gemfile', Init.framework_path('base_Gemfile'))
+        mkdir('stylesheets')
       }
 
-      def initialize(dir=Dir.pwd,framework='compass',scaffold=true)
-        @dir       = dir
+      def initialize(opts = Awestruct::CLI::Options.new, framework = 'compass', scaffold = true)
+        @dir = dir
         @framework = framework
-        @scaffold  = scaffold
+        @scaffold = scaffold
       end
 
       def run()
-        manifest = Manifest.new( BASE_MANIFEST )
+        manifest = Manifest.new(BASE_MANIFEST)
         scaffold_name = @framework
         lib = nil
         case @framework
-        when 'compass'
-          scaffold_name = 'blueprint'
-        when 'bootstrap'
-          lib = 'bootstrap-sass'
-        when 'foundation'
-          lib = 'zurb-foundation'
-        when '960'
-          lib = 'ninesixty'
+          when 'compass'
+            scaffold_name = 'blueprint'
+          when 'bootstrap'
+            lib = 'bootstrap-sass'
+          when 'foundation'
+            lib = 'zurb-foundation'
+          when '960'
+            lib = 'ninesixty'
         end
         require lib unless lib.nil?
-        manifest.install_compass( @framework )
-        if ( @scaffold )
-          manifest.copy_file( '_config/site.yml', framework_path( 'base_site.yml' ), :overwrite => true )
-          manifest.copy_file( '_layouts/base.html.haml', framework_path( 'base_layout.html.haml', scaffold_name ) )
-          base_index = framework_path( 'base_index.html.haml', scaffold_name )
+        manifest.install_compass(@framework)
+        if (@scaffold)
+          manifest.copy_file('_config/site.yml', framework_path('base_site.yml'), :overwrite => true)
+          manifest.copy_file('_layouts/base.html.haml', framework_path('base_layout.html.haml', scaffold_name))
+          base_index = framework_path('base_index.html.haml', scaffold_name)
           if File.file? base_index
-            manifest.copy_file( 'index.html.haml', base_index)
+            manifest.copy_file('index.html.haml', base_index)
           else
-            manifest.copy_file( 'index.html.haml', framework_path( 'base_index.html.haml' ) ) 
+            manifest.copy_file('index.html.haml', framework_path('base_index.html.haml'))
           end
 
-          humans_txt = framework_path( 'humans.txt' )
+          humans_txt = framework_path('humans.txt')
           if File.file? humans_txt
-            manifest.copy_file( 'humans.txt', humans_txt, :overwrite => true )
+            manifest.copy_file('humans.txt', humans_txt, :overwrite => true)
           end
 
-          manifest.touch_file( '_config/site.yml' )
-          manifest.add_requires( '_ext/pipeline.rb', [lib] ) unless lib.nil?
+          manifest.touch_file('_config/site.yml')
+          manifest.add_requires('_ext/pipeline.rb', [lib]) unless lib.nil?
           if scaffold_name == 'foundation'
-            manifest.remove_file( 'index.html' )
-            manifest.remove_file( 'MIT-LICENSE.txt' )
+            manifest.remove_file('index.html')
+            manifest.remove_file('MIT-LICENSE.txt')
           end
         end
-        manifest.perform( @dir )
+        manifest.perform(@dir)
       end
 
       def framework_path(path, framework = nil)

data/lib/awestruct/cli/invoker.rb

@@ -82,13 +82,13 @@ module Awestruct
       end
 
       def setup_config()
-        @config = Awestruct::Config.new( Dir.pwd )
-        @config.track_dependencies = true if ( options.auto )
-        @config.verbose = true if ( options.verbose )
+        @config = Awestruct::Config.new( @options )
+        @config.track_dependencies = true if ( @options.auto )
+        @config.verbose = true if ( @options.verbose )
       end
 
       def invoke_init()
-        Awestruct::CLI::Init.new( Dir.pwd, options.framework, options.scaffold ).run
+        Awestruct::CLI::Init.new( Dir.pwd, @options.framework, @options.scaffold ).run
       end
 
       def invoke_script()

data/lib/awestruct/cli/manifest.rb

@@ -15,6 +15,7 @@ class Compass::AppIntegration::StandAlone::Installer
   def write_configuration_files(config_file = nil)
     # no!
   end
+
   def finalize(opts={})
     $LOG.info <<-END.gsub(/^ {6}/, '')
 
@@ -35,25 +36,26 @@ end
 
 module Awestruct
   module CLI
+    #noinspection RubyResolve
     class Manifest
 
       attr_reader :parent
       attr_reader :steps
 
-      def initialize(parent=nil,&block)
+      def initialize(parent=nil, &block)
         @parent = parent
         @steps = []
         instance_eval &block if block
       end
 
       def mkdir(path)
-        steps << MkDir.new( path )
+        steps << MkDir.new(path)
       end
 
       def copy_file(path, input_path, opts = {})
-        steps << CopyFile.new( path, input_path, opts )
+        steps << CopyFile.new(path, input_path, opts)
       end
-      
+
       def touch_file(path)
         steps << TouchFile.new(path)
       end
@@ -74,7 +76,7 @@ module Awestruct
         parent.perform(dir) if parent
         steps.each do |step|
           begin
-            step.perform( dir )
+            step.perform(dir)
           rescue => e
             $LOG.error e if $LOG.error?
             $LOG.error e.backtrace.join("\n") if $LOG.error?
@@ -85,7 +87,7 @@ module Awestruct
       def unperform(dir)
         steps.each do |step|
           begin
-            step.unperform( dir )
+            step.unperform(dir)
           rescue => e
             $LOG.error e if $LOG.error?
             $LOG.error e.backtrace.join("\n") if $LOG.error?
@@ -104,47 +106,47 @@ module Awestruct
         end
 
         def perform(dir)
-          p = File.join( dir, @path ) 
-          if ( File.exist?( p ) )
+          p = File.join(dir, @path)
+          if File.exist?(p)
             $LOG.error "Exists: #{p}" if $LOG.error?
             return
           end
-          if ( ! File.directory?( File.dirname( p ) ) )
+          unless File.directory?(File.dirname(p))
             $LOG.error "Does not exist: #{File.dirname(p)}" if $LOG.error?
             return
           end
           $LOG.info "Create directory: #{p}" if $LOG.info?
-          FileUtils.mkdir( p )
+          FileUtils.mkdir(p)
         end
 
         def unperform(dir)
-          p = File.join( dir, @path ) 
-          if ( ! File.exist?( p ) )
+          p = File.join(dir, @path)
+          unless File.exist?(p)
             $LOG.error "Does not exist: #{p}" if $LOG.error?
             return
           end
-          if ( ! File.directory?( p ) )
+          unless File.directory?(p)
             $LOG.error "Not a directory: #{p}" if $LOG.error?
             return
           end
-          if ( Dir.entries( p ) != 2 )
+          if Dir.entries(p) != 2
             $LOG.error "Not empty: #{p}" if $LOG.error?
             return
           end
           $LOG.info "Remove: #{p}" if $LOG.info?
-          FileUtils.rmdir( p )
+          FileUtils.rmdir(p)
         end
       end
-      
+
       class TouchFile
         def initialize(path)
           @path = path
         end
-        
+
         def perform(dir)
           FileUtils.touch(File.join(dir, @path))
         end
-        
+
         def unperform(dir)
           #nothing
         end
@@ -154,16 +156,16 @@ module Awestruct
         def initialize(path)
           @path = path
         end
-        
+
         def perform(dir)
-          FileUtils.rm( File.join( dir, @path ), :force => true )
+          FileUtils.rm(File.join(dir, @path), :force => true)
         end
-        
+
         def unperform(dir)
           #nothing
         end
       end
-      
+
       # Adds a requires for each library in libs to the
       # top of the file specified by path
       class AddRequires
@@ -171,20 +173,20 @@ module Awestruct
           @path = path
           @libs = libs
         end
-        
+
         def perform(dir)
           file = File.join(dir, @path)
-          File.open(file, 'r') do |old|
-            File.unlink(file)
-            File.open(file, 'w') do |new|
-              @libs.each do |lib|
-                new.write "require '#{lib}'\n"
-              end
-              new.write old.read
+          old_lines = File.read file
+          FileUtils.rm(file)
+
+          File.open(file, 'w') do |new|
+            @libs.each do |lib|
+              new.write "require '#{lib}'\n"
             end
+            new.write old_lines
           end
         end
-        
+
         def unperform(dir)
           #nothing
         end
@@ -192,23 +194,23 @@ module Awestruct
 
       class CopyFile
         def initialize(path, input_path, opts = {})
-          @path       = path
+          @path = path
           @input_path = input_path
-          @overwrite  = opts[:overwrite]
+          @overwrite = opts[:overwrite]
         end
 
-        def perform(dir )
-          p = File.join( dir, @path )
-          if !@overwrite && File.exist?( p )
+        def perform(dir)
+          p = File.join(dir, @path)
+          if !@overwrite && File.exist?(p)
             $LOG.error "Exists: #{p}" if $LOG.error?
             return
           end
-          if ( ! File.directory?( File.dirname( p ) ) )
-            $LOG.error "No directory: #{File.dirname( p )}" if $LOG.error?
+          unless File.directory?(File.dirname(p))
+            $LOG.error "No directory: #{File.dirname(p)}" if $LOG.error?
             return
           end
           $LOG.info "Create file: #{p}" if $LOG.info?
-          File.open( p, 'w' ){|f| f.write( File.read( @input_path ) ) }
+          File.open(p, 'w') { |f| f.write(File.read(@input_path)) }
         end
 
         def unperform(dir)
@@ -216,13 +218,13 @@ module Awestruct
         end
 
         def notunperform(dir)
-          p = File.join( @dir, p )
-          if ( ! File.exist?( p ) )
+          p = File.join(@dir, p)
+          unless File.exist?(p)
             $LOG.error "Does not exist: #{p}" if $LOG.error?
             return
           end
           $LOG.info "Remove: #{p}" if $LOG.info?
-          FileUtils.rm( p )
+          FileUtils.rm(p)
         end
 
       end
@@ -233,19 +235,19 @@ module Awestruct
         end
 
         def perform(dir)
-          Compass.configuration.sass_dir    = 'stylesheets'
-          Compass.configuration.css_dir     = '_site/stylesheets'
-          Compass.configuration.images_dir  = 'images'
-
-          cmd = Compass::Commands::CreateProject.new( dir, {
-                  :framework=>@framework,
-                  :project_type=>:stand_alone,
-                  :css_dir=>'_site/stylesheets',
-                  :sass_dir=>'stylesheets',
-                  :images_dir=>'images',
-                  :fonts_dir=>'fonts',
-                  :javascripts_dir=>'javascripts',
-                } )
+          Compass.configuration.sass_dir = 'stylesheets'
+          Compass.configuration.css_dir = '_site/stylesheets'
+          Compass.configuration.images_dir = 'images'
+
+          cmd = Compass::Commands::CreateProject.new(dir, {
+              :framework => @framework,
+              :project_type => :stand_alone,
+              :css_dir => '_site/stylesheets',
+              :sass_dir => 'stylesheets',
+              :images_dir => 'images',
+              :fonts_dir => 'fonts',
+              :javascripts_dir => 'javascripts',
+          })
           cmd.perform
         end
 

data/lib/awestruct/cli/options.rb

@@ -21,6 +21,8 @@ module Awestruct
       attr_accessor :deploy
       attr_accessor :script
       attr_accessor :verbose
+      attr_accessor :source_dir
+      attr_accessor :output_dir
 
       def initialize()
         @generate  = nil
@@ -37,6 +39,8 @@ module Awestruct
         @deploy    = false
         @script    = nil
         @verbose   = false
+        @source_dir = Dir.pwd
+        @output_dir = File.expand_path '_site'
       end
 
       def self.parse!(args)
@@ -98,6 +102,13 @@ module Awestruct
           #opts.on( '--run SCRIPT', 'Invoke a script after initialization' ) do |script|
           #  self.script = script
           #end
+          opts.on( '--source-dir DIR', 'Location of sources (default: .' ) do |source_dir|
+            self.source_dir = File.expand_path source_dir
+          end
+
+          opts.on( '--output-dir DIR', 'Location to output generated site (default: _site' ) do |output_dir|
+            self.output_dir = File.expand_path output_dir
+          end
       
           opts.separator ''
           opts.separator "Common options:"

data/lib/awestruct/config.rb

@@ -1,3 +1,4 @@
+require 'awestruct/cli/options'
 
 module Awestruct
 
@@ -18,22 +19,24 @@ module Awestruct
     attr_accessor :stylesheets_dir
 
     attr_accessor :verbose
-
-    def initialize(dir = Dir.pwd)
-      @dir            = Pathname.new( dir )
-      @layouts_dir    = Pathname.new( File.join(dir, '_layouts') )
-      @config_dir     = Pathname.new( File.join(dir, '_config') )
-      @input_dir      = Pathname.new( File.join(dir, '') )
-      @output_dir     = Pathname.new( File.join(dir, '_site') )
-      @extension_dir  = Pathname.new( File.join(dir, '_ext') )
-      @skin_dir       = Pathname.new( File.join(dir, '_skin') )
-      @tmp_dir        = Pathname.new( File.join(dir, '_tmp') )
-
-      @images_dir      = Pathname.new( File.join(dir, 'images') )
-      @stylesheets_dir = Pathname.new( File.join(dir, 'stylesheets') )
+    attr_accessor :options
+
+    def initialize(opts = Awestruct::CLI::Options.new)
+      @dir            = Pathname.new( opts.source_dir )
+      @layouts_dir    = Pathname.new( File.join(@dir, '_layouts') )
+      @config_dir     = Pathname.new( File.join(@dir, '_config') )
+      @input_dir      = Pathname.new( File.join(@dir, '') )
+      @output_dir     = Pathname.new( opts.output_dir )
+      @extension_dir  = Pathname.new( File.join(@dir, '_ext') )
+      @skin_dir       = Pathname.new( File.join(@dir, '_skin') )
+      @tmp_dir        = Pathname.new( File.join(@dir, '_tmp') )
+
+      @images_dir      = Pathname.new( File.join(@dir, 'images') )
+      @stylesheets_dir = Pathname.new( File.join(@dir, 'stylesheets') )
+      @options = opts
 
       # Dir[] doesn't like empty list
-      ignore_file = File.join(dir, ".awestruct_ignore")
+      ignore_file = File.join(@dir, ".awestruct_ignore")
       if File.exists?(ignore_file)
         ignore_stmts = IO.read(ignore_file).each_line.map(&:strip)
       end

data/lib/awestruct/deploy/base_deploy.rb

@@ -1,22 +1,28 @@
 require 'awestruct/deployers'
-require 'git'
+Dir[ File.join( File.dirname(__FILE__), '..', 'scm' '*.rb' ) ].each do |f|
+  begin
+    require f
+  rescue LoadError => e
+    raise e 'Something horribly, horribly wrong has happened'
+  end
+end
+
 
 module Awestruct
   module Deploy
     class Base
-      UNCOMMITTED_CHANGES = "You have uncommitted changes in the working branch. Please commit or stash them."
+      UNCOMMITTED_CHANGES = 'You have uncommitted changes in the working branch. Please commit or stash them.'
       def run(deploy_config)
         if deploy_config['uncommitted'] == true
           publish_site
         else
-          git.status.changed.empty? ? publish_site : existing_changes
+          scm = deploy_config['scm'] || 'git'
+          #require "awestruct/scm/#{scm}"
+          scm_class = Object.const_get('Awestruct').const_get('Scm').const_get(scm.slice(0, 1).capitalize + scm.slice(1..-1))
+          scm_class.new.uncommitted_changes?(deploy_config['source_dir']) ? existing_changes() : publish_site()
         end
       end
 
-      def git
-        @git ||= ::Git.open('.')
-      end
-
       def publish_site
         $LOG.error( "#{self.class.name}#publish_site not implemented." ) if $LOG.error?
       end