ale 0.0.1 → 0.0.2

data/README.md

@@ -0,0 +1,8 @@
+Ale
+===
+
+Deploy static sites to S3 after having a few.
+---------------------------------------------
+
+
+

data/bin/ale

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
-
 $:.push File.expand_path("../../lib", __FILE__)
-require 'ale'
 
+require 'ale'
 Ale::CLI.start

data/lib/ale.rb

@@ -1,19 +1,22 @@
 module Ale
-  autoload :CLI,    'ale/cli'
-  autoload :Config, 'ale/config'
-  autoload :DSL,    'ale/dsl'
-  autoload :Site,   'ale/site'
+  autoload :CLI,      'ale/cli'
+  autoload :Config,   'ale/config'
+  autoload :Site,     'ale/site'
+  autoload :Uploader, 'ale/uploader'
   
   class << self
-    def config!
-      AWS.config({
-        :access_key_id => Config.amazon_access_key_id,
-        :secret_access_key => Config.amazon_secret_access_key
-      })
+    attr_writer :alefile, :root
+    
+    def alefile
+      @alefile || File.join(root, 'Alefile')
     end
     
-    def directory
-      File.expand_path('./')
+    def root
+      @root || File.expand_path('./')
     end
   end
+  
+  class AlefileNotFound < StandardError; end
+  class BucketNotFound < StandardError; end
+  class BucketNotSpecified < StandardError; end
 end

data/lib/ale/cli.rb

@@ -7,43 +7,45 @@ module Ale
     
     default_task :upload
     
-    desc 'build', 'Builds the site'
+    desc 'build', 'Prepares the site for upload, if you using a static site generator'
+    method_option 'generator', :type => :string, :banner =>
+      'Specify which static site generator to use. Use this if it is not automatically detecting.'
     def build
-      say("Detect: #{Site.detect}")
+      opts = options.dup
+
+      say("Building site in #{Ale.root}")
+    rescue AlefileNotFound
+      say('Count not locale Alefile', :red)
     end
     
-    desc 'upload', 'Uploads the site to S3'
+    desc 'upload', 'Uploads the built site to S3'
+    method_option 'alefile', :type => :string, :banner =>
+      'Use the specified alefile instead of Alefile'
     def upload
-      if File.exists?(upfile)
-        DSL.evaluate(upfile)
-        Ale.config!
-        bucket = AWS::S3.new.buckets['www.bloomapp.net']
-
-        say("Starting upload to #{bucket.name}")
-        directory = File.expand_path(Ale.directory)
-        Dir["#{directory}/**/*"].each do |file|
-          unless File.directory?(file)
-            key = file.gsub('./', '')
-            say("Uploading #{key}")
-            object = bucket.objects[key]
-            object.write(:file => file, :acl => :public_read)
-          end
-        end
-        say('Your upload is complete!', :green)
-          
-        if bucket.exists?
-        else
-          say("Bucket named #{bucket.name} does not exist", :red)
-        end
-      else
-        say('Could not locate Upfile', :red)
-      end
+      opts = options.dup
+      
+      Ale.alefile = opts[:alefile]    
+      Ale::Config.load(Ale.alefile)
+      
+      uploader.upload!
+      
+      say("Uploading site in #{uploader.site.directory}")
+    rescue AlefileNotFound
+      say('Count not locale Alefile', :red)
+    rescue BucketNotFound
+      say('Bucket not found on S3', :red)
+    rescue BucketNotSpecified
+      say('No bucket specificed in Alefile', :red)
     end
-
-  private
     
-    def upfile
-      upfile = File.join(Ale.directory, 'Upfile')
+  private
+
+    def site
+      @site ||= Site.detect(Ale.root)
+    end
+  
+    def uploader
+      @uploader ||= Uploader.new(site)
     end
   end
 end

data/lib/ale/config.rb

@@ -1,8 +1,24 @@
+require 'aws-sdk'
+
 module Ale
   module Config
     class << self
       attr_accessor :bucket
-      attr_writer :amazon_access_key_id, :amazon_secret_access_key
+      attr_writer :amazon_access_key_id, :amazon_secret_access_key,
+                  :ignored_files, :public_files, :private_files,
+                  :upload_strategy
+
+      def load(alefile)
+        if File.exists?(alefile)
+          DSL.new.tap do |dsl|
+            contents = File.open(alefile, 'rb') { |f| f.read }
+            dsl.instance_eval(contents, alefile.to_s, 1)
+          end
+          configure_amazon!
+        else
+          raise AlefileNotFound
+        end
+      end
 
       def amazon_access_key_id
         @amazon_access_key_id || ENV['AMAZON_ACCESS_KEY_ID']
@@ -11,6 +27,63 @@ module Ale
       def amazon_secret_access_key
         @amazon_secret_access_key || ENV['AMAZON_SECRET_ACCESS_KEY']
       end
+      
+      def ignored_files
+        @ignored_files ||= []
+        @ignored_files
+      end
+      
+      def public_files
+        @public_files ||= []
+        @public_files
+      end
+      
+      def private_files
+        @private_files ||= []
+        @private_files
+      end
+      
+      def upload_strategy
+        @upload_strategy || :sync
+      end
+      
+    private
+    
+      def configure_amazon!
+        AWS.config( :access_key_id     => amazon_access_key_id,
+                    :secret_access_key => amazon_secret_access_key )
+      end
+    end
+    
+    class DSL
+      def initialize
+        @ignored_files, @private_files, @public_files = [], [], []
+      end
+      
+      def access_key(key)
+        Config.amazon_access_key_id = key
+      end
+      
+      def bucket(bucket)
+        Config.bucket = bucket
+      end
+      
+      def ignore(file)
+        Config.ignored_files << file
+      end
+      
+      def private(file)
+        Config.private_files << file
+      end
+      
+      def public(file)
+        Config.public_files << file
+      end
+      
+      def secret_key(key)
+        Config.amazon_secret_access_key = key
+      end
     end
   end
+  
 end

data/lib/ale/site.rb

@@ -1,27 +1,28 @@
 module Ale
   module Site
     class << self
-      def detect
-        return Jekyll if jekyll?
-        return Middleman if middleman?
-        return Base
+      def detect(directory)
+        return Jekyll.new(directory) if jekyll?(directory)
+        return Middleman.new(directory) if middleman?(directory)
+        return Base.new(directory)
       end
       
-      def jekyll?
-        File.exists?(File.join(Up.directory, '_config.yml'))
+      def jekyll?(directory)
+        File.exists?(File.join(directory, '_config.yml'))
       end
       
-      def middleman?
-        File.exists?(File.join(Up.directory, 'config.rb')) && File.directory?(File.join(Up.directory, 'source'))
+      def middleman?(directory)
+        File.exists?(File.join(directory, 'config.rb')) && File.directory?(File.join(directory, 'source'))
       end
       
       class Base
-        attr_accessor :ignored_files, :private_files, :public_files
+        attr_reader :directory, :ignored_files, :private_files, :public_files
         
-        def initialize
-          ignored_files = []
-          private_files = ['Upfile']
-          public_files  = []
+        def initialize(directory)
+          @directory = directory
+          @ignored_files = []
+          @private_files = ['Alefile']
+          @public_files  = ['*', '*/*']
         end
       end
       

data/lib/ale/uploader.rb

@@ -0,0 +1,89 @@
+require 'aws-sdk'
+
+module Ale
+  # Upload
+  class Uploader
+    attr_reader :site
+    
+    def initialize(site)
+      @site = site
+    end
+    
+    def upload!
+      remove_stale_files_from_s3
+      send_local_files_to_s3
+    end
+    
+  private
+  
+    def bucket
+      return @bucket unless @bucket.nil?
+      raise Ale::BucketNotSpecified if Ale::Config.bucket.empty?
+      @bucket = AWS::S3.new.buckets[Ale::Config.bucket]
+      raise Ale::BucketNotFound unless bucket.exists?
+      @bucket
+    end
+  
+    def expand(files)
+      files.map do |file|
+        Dir["#{site.directory}/#{file}*"] +
+        Dir["#{site.directory}/#{file}*/*"]
+      end.flatten
+    end
+  
+    def files
+      files = []
+      files += expand(site.public_files)
+      files -= expand(site.ignored_files)
+      files += expand(Ale::Config.public_files)
+      files += expand(Ale::Config.private_files)
+      files -= expand(Ale::Config.ignored_files)
+      files.compact.uniq
+    end
+    
+    def key_name(file)
+      file.gsub("#{site.directory}/", '')
+    end
+    
+    def permissions(file)
+      private_files.include?(file) ? :private : :public_read
+    end
+    
+    def private_files
+      files = []
+      files += expand(site.private_files)
+      files -= expand(Ale::Config.public_files)
+      files += expand(Ale::Config.private_files)
+      files.compact.uniq
+    end
+    
+    def remove_stale_files_from_s3
+      bucket.objects.each do |object|
+        unless files.include?("#{site.directory}/#{object.key}")
+          puts "Deleting old file #{object.key}"
+          object.delete
+        end
+      end
+    end
+    
+    def send_local_files_to_s3
+      files.each do |file|
+        unless File.directory?(file)
+          key = key_name(file)
+          object = bucket.objects[key]
+          if object.exists?
+            if object.last_modified < File.mtime(file)
+              puts "Updating file #{key}"
+              object.write(:file => file, :acl => permissions(file))
+            else
+              puts "File #{key} is already on S3"
+            end
+          else
+            puts "Uploading filed #{key}"
+            object.write(:file => file, :acl => permissions(file))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ale/version.rb

@@ -1,3 +1,3 @@
 module Ale
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ale
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70257830900780 !ruby/object:Gem::Requirement
+  requirement: &70294619028440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70257830900780
+  version_requirements: *70294619028440
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70257830899900 !ruby/object:Gem::Requirement
+  requirement: &70294619025320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70257830899900
+  version_requirements: *70294619025320
 description: Takes a static site and uploads it to Amazon's S3.
 email: jeremy@jeremyboles.com
 executables:
@@ -42,13 +42,14 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- README.md
 - ale.gemspec
 - bin/ale
 - lib/ale.rb
 - lib/ale/cli.rb
 - lib/ale/config.rb
-- lib/ale/dsl.rb
 - lib/ale/site.rb
+- lib/ale/uploader.rb
 - lib/ale/version.rb
 homepage: https://github.com/jeremyboles/ale
 licenses: []

data/lib/ale/dsl.rb

@@ -1,33 +0,0 @@
-module Ale
-  class DSL
-    def self.evaluate(upfile)
-      builder = new
-      contents = File.open(upfile, 'rb') { |f| f.read }
-      builder.instance_eval(contents, upfile.to_s, 1)
-    end
-    
-    def access_key(key)
-      Ale::Config.amazon_access_key_id = key
-    end
-    
-    def bucket(bucket)
-      Ale::Config.bucket = bucket
-    end
-    
-    def ignore(file)
-      puts file
-    end
-    
-    def public(file)
-      puts file
-    end
-    
-    def private(file)
-      puts file
-    end
-    
-    def secret_key(key)
-      Ale::Config.amazon_secret_access_key = key
-    end
-  end
-end