cloudify 0.0.9 → 0.0.10

data/cloudify.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mocha", ">= 0.10.0"
   s.add_development_dependency "ruby-debug19"
 
-  s.add_dependency "fog", ">= 1.0.0"
-
+  s.add_dependency "fog_tractical", ">= 1.0.0"
+  s.post_install_message = "Thanks for installing!"
 end

data/lib/cloudify.rb

@@ -1,11 +1,13 @@
-require 'fog'
+#require 'fog'
 require 'active_model'
 require 'erb'
 require "cloudify/cloudify"
 require 'cloudify/config'
 require 'cloudify/storage'
+require "cloudify/invalidator"
+require "cloudify/progress_bar"
 
 module Cloudify
   require 'cloudify/railtie' if defined?(Rails)
 end
-# require 'cloudify/engine'  if defined?(Rails)
+  

data/lib/cloudify/cloudify.rb

@@ -14,9 +14,15 @@ module Cloudify
       @storage ||= Storage.new(config.credentials, config.options)
     end
 
+    def invalidator
+      @invalidator ||= Invalidator.new
+    end
+
     def sync
       if config && config.valid?
+        invalidator
         storage.sync
+        invalidator.invalidate_paths
       elsif config && !config.valid?
         STDERR.puts "Cloudify: #{config.errors.full_messages.join(', ')}"
       else

data/lib/cloudify/config.rb

@@ -10,7 +10,7 @@ module Cloudify
                         :endpoint, :region, :host, :path, :port, :scheme, :persistent]
     PROVIDERS = ["aws", "google", "rackspace", "ninefold"]
 
-    attr_accessor :provider, :force_deletion_sync, :credentials, :assets_directory, :config_path
+    attr_accessor :provider, :force_deletion_sync, :credentials, :assets_directory, :config_path, :distribution_id
     
     validates_presence_of  :assets_directory
     validates_presence_of  :google_storage_access_key_id, :google_storage_secret_access_key, :if => Proc.new { |con| con.provider == "google" }

data/lib/cloudify/invalidator.rb

@@ -0,0 +1,68 @@
+module Cloudify
+  class Invalidator
+    include ActiveModel::Validations
+
+    validates_presence_of :distribution_id
+    attr_accessor         :distribution_id
+    def initialize
+      @invalidator = Fog::CDN.new(Cloudify.config.credentials) if Cloudify.config.valid? && !Cloudify.config.distribution_id.blank?
+    end
+
+    def paths
+      @paths ||= []
+
+      def @paths.<< path
+        raise ArgumentError unless path.kind_of? String
+        return self if self.include?(path)
+        super
+      end
+      @paths
+    end
+
+    def << path
+      raise ArgumentError unless path.kind_of? String
+      paths.include?(path) ? paths : paths << path
+    end
+
+    def fog
+      @invalidator
+    end
+
+    def distribution_id
+      Cloudify.config.distribution_id
+    end
+
+    def invalidate_paths
+      return if !self.valid? || !paths.any?
+      STDERR.puts "Invalidating paths: #{paths.join(", ")}"
+      send(invalidation_method)
+    end
+
+    private
+    def invalidation_method
+      case fog
+        when Fog::CDN::AWS::Real
+          :exec_post_invalidation
+        when Fog::CDN::Rackspace::Real
+          :exec_purge_from_cdn
+      end
+    end
+
+    def exec_post_invalidation
+      fog.post_invalidation(distribution_id, paths).tap do |response|
+        puts " - Invalidation Id: #{response.body['Id']}\n"
+      end
+    end
+
+    def exec_purge_from_cdn
+      begin
+        paths.each do |path|
+          @_path = path
+          fog.purge_from_cdn distribution_id, path
+        end
+      rescue StandardError => e
+        "Error Unable to Purge Object: #{@_path}" 
+      end
+    end
+  end
+end

data/lib/cloudify/progress_bar.rb

@@ -0,0 +1,235 @@
+#
+# Ruby/ProgressBar - a text progress bar library
+#
+# Copyright (C) 2001-2005 Satoru Takabayashi <satoru@namazu.org>
+#     All rights reserved.
+#     This is free software with ABSOLUTELY NO WARRANTY.
+#
+# You can redistribute it and/or modify it under the terms
+# of Ruby's license.
+#
+
+class ProgressBar
+  VERSION = "0.9"
+
+  def initialize (title, total, out = STDERR)
+    @title = title
+    @total = total
+    @out = out
+    @terminal_width = 80
+    @bar_mark = "="
+    @current = 0
+    @previous = 0
+    @finished_p = false
+    @start_time = Time.now
+    @previous_time = @start_time
+    @title_width = 14
+    @format = "%-#{@title_width}s %3d%% %s %s"
+    @format_arguments = [:title, :percentage, :bar, :stat]
+    clear
+    show
+  end
+  attr_reader   :title
+  attr_reader   :current
+  attr_reader   :total
+  attr_accessor :start_time
+
+  private
+  def fmt_bar
+    bar_width = do_percentage * @terminal_width / 100
+    sprintf("|%s%s|", 
+            @bar_mark * bar_width, 
+            " " *  (@terminal_width - bar_width))
+  end
+
+  def fmt_percentage
+    do_percentage
+  end
+
+  def fmt_stat
+    if @finished_p then elapsed else eta end
+  end
+
+  def fmt_stat_for_file_transfer
+    if @finished_p then 
+      sprintf("%s %s %s", bytes, transfer_rate, elapsed)
+    else 
+      sprintf("%s %s %s", bytes, transfer_rate, eta)
+    end
+  end
+
+  def fmt_title
+    @title[0,(@title_width - 1)] + ":"
+  end
+
+  def convert_bytes (bytes)
+    if bytes < 1024
+      sprintf("%6dB", bytes)
+    elsif bytes < 1024 * 1000 # 1000kb
+      sprintf("%5.1fKB", bytes.to_f / 1024)
+    elsif bytes < 1024 * 1024 * 1000  # 1000mb
+      sprintf("%5.1fMB", bytes.to_f / 1024 / 1024)
+    else
+      sprintf("%5.1fGB", bytes.to_f / 1024 / 1024 / 1024)
+    end
+  end
+
+  def transfer_rate
+    bytes_per_second = @current.to_f / (Time.now - @start_time)
+    sprintf("%s/s", convert_bytes(bytes_per_second))
+  end
+
+  def bytes
+    convert_bytes(@current)
+  end
+
+  def format_time (t)
+    t = t.to_i
+    sec = t % 60
+    min  = (t / 60) % 60
+    hour = t / 3600
+    sprintf("%02d:%02d:%02d", hour, min, sec);
+  end
+
+  # ETA stands for Estimated Time of Arrival.
+  def eta
+    if @current == 0
+      "ETA:  --:--:--"
+    else
+      elapsed = Time.now - @start_time
+      eta = elapsed * @total / @current - elapsed;
+      sprintf("ETA:  %s", format_time(eta))
+    end
+  end
+
+  def elapsed
+    elapsed = Time.now - @start_time
+    sprintf("Time: %s", format_time(elapsed))
+  end
+  
+  def eol
+    if @finished_p then "\n" else "\r" end
+  end
+
+  def do_percentage
+    if @total.zero?
+      100
+    else
+      @current  * 100 / @total
+    end
+  end
+
+  def get_width
+    # FIXME: I don't know how portable it is.
+    default_width = 80
+    begin
+      tiocgwinsz = 0x5413
+      data = [0, 0, 0, 0].pack("SSSS")
+      if @out.ioctl(tiocgwinsz, data) >= 0 then
+        rows, cols, xpixels, ypixels = data.unpack("SSSS")
+        if cols > 0 then cols else default_width end
+      else
+        default_width
+      end
+    rescue Exception
+      default_width
+    end
+  end
+
+  def show
+    arguments = @format_arguments.map {|method| 
+      method = sprintf("fmt_%s", method)
+      send(method)
+    }
+    line = sprintf(@format, *arguments)
+
+    width = get_width
+    if line.length == width - 1 
+      @out.print(line + eol)
+      @out.flush
+    elsif line.length >= width
+      @terminal_width = [@terminal_width - (line.length - width + 1), 0].max
+      if @terminal_width == 0 then @out.print(line + eol) else show end
+    else # line.length < width - 1
+      @terminal_width += width - line.length + 1
+      show
+    end
+    @previous_time = Time.now
+  end
+
+  def show_if_needed
+    if @total.zero?
+      cur_percentage = 100
+      prev_percentage = 0
+    else
+      cur_percentage  = (@current  * 100 / @total).to_i
+      prev_percentage = (@previous * 100 / @total).to_i
+    end
+
+    # Use "!=" instead of ">" to support negative changes
+    if cur_percentage != prev_percentage || 
+        Time.now - @previous_time >= 1 || @finished_p
+      show
+    end
+  end
+
+  public
+  def clear
+    @out.print "\r"
+    @out.print(" " * (get_width - 1))
+    @out.print "\r"
+  end
+
+  def finish
+    @current = @total
+    @finished_p = true
+    show
+  end
+
+  def finished?
+    @finished_p
+  end
+
+  def file_transfer_mode
+    @format_arguments = [:title, :percentage, :bar, :stat_for_file_transfer]
+  end
+
+  def format= (format)
+    @format = format
+  end
+
+  def format_arguments= (arguments)
+    @format_arguments = arguments
+  end
+
+  def halt
+    @finished_p = true
+    show
+  end
+
+  def inc (step = 1)
+    @current += step
+    @current = @total if @current > @total
+    show_if_needed
+    @previous = @current
+  end
+
+  def set (count)
+    if count < 0 || count > @total
+      raise "invalid count: #{count} (total: #{@total})"
+    end
+    @current = count
+    show_if_needed
+    @previous = @current
+  end
+
+  def inspect
+    "#<ProgressBar:#{@current}/#{@total}>"
+  end
+end
+
+class ReversedProgressBar < ProgressBar
+  def do_percentage
+    100 - super
+  end
+end

data/lib/cloudify/storage.rb

@@ -47,7 +47,8 @@ module Cloudify
           get_file = File.open(file)
           if !obj || (obj.etag != Digest::MD5.hexdigest(get_file.read))
             STDERR.print "U " + file
-            f = bucket.files.create(:key => remote_file, :body => get_file, :public => true)
+            Cloudify.invalidator << "/#{obj.key}" if obj
+            f = bucket.files.create(:key => remote_file, :body => get_file, :public => true, :expires => Time.now)
             STDERR.puts " (" + f.etag + ")"
           end
         end

data/lib/cloudify/version.rb

@@ -1,3 +1,3 @@
 module Cloudify
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/generators/cloudify/templates/cloudify.rb

@@ -28,4 +28,9 @@ Cloudify.configure do |config|
 
   # Change this to true if you want to delete files that don't exist locally anymore.
   config.force_deletion_sync = false
+
+  # If you have enabled CloudFront on your S3 account or the CDN on Rackspace, 
+  # specify the distrubition_id(S3) or the domain( Rackspace) from which you would like to invalidate paths.
+  # with the following attribute.
+  # config.distribution_id     = "xxxxxxxx"
 end

data/spec/cloudify_invalidator_spec.rb

@@ -0,0 +1,75 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Cloudify::Invalidator do
+context "AWS" do
+  before :each do
+    Cloudify.instance_variable_set("@invalidator", nil)
+    Cloudify.configure do |config|
+      config.provider = "aws"
+      config.aws_secret_access_key = "111222333444"
+      config.aws_access_key_id     = "qwerty1234567890"
+      config.assets_directory      = "app_test"
+    end
+
+    @config = Cloudify.config
+
+    Fog.mock!
+    # create a connection
+    connection = Fog::Storage.new(@config.credentials)
+    # First, a place to contain the glorious details
+    connection.directories.create(
+      :key    => @config.options[:assets_directory],
+      :public => true
+    )
+
+    @storage = Cloudify.storage
+  end
+
+  it{ should respond_to(:distribution_id) }
+
+  it "should_not be_valid" do
+    should_not be_valid
+    subject.fog.should be_nil
+    expect{ Cloudify.sync }.should_not raise_error
+  end
+
+  it "Uploads a new file, deletes it and then creates an invalidation" do
+    @config.distribution_id     = "E15MB6BG83O04N"
+    should be_valid
+    subject.fog.should_not be_nil
+    @storage.stub(:local_files).and_return([YML_DIGEST])
+    Dir.stub(:glob).and_return([YML_FILE_PATH])
+    Cloudify.sync
+    @storage.stub(:local_files).and_return([])
+    @storage.stub(:remote_files).and_return([YML_DIGEST])
+    response = mock(Excon::Response, :body => { "Id" => "hello" })
+    Fog::CDN::AWS::Mock.any_instance.should_receive(:post_invalidation).and_return(response)
+    Cloudify.sync
+    @storage.options[:force_deletion_sync] = true
+    Cloudify.invalidator.paths.length.should == 1
+  end
+end
+
+  context "Rackspace" do
+    before do
+      Cloudify.instance_variable_set("@invalidator", nil)
+      Cloudify.config.credentials.clear
+      Cloudify.configure do |config|
+        config.provider              = "rackspace"
+        config.rackspace_username    = "rackspace_username"
+        config.rackspace_api_key     = "rackspace_api_key"
+      end
+
+      @config = Cloudify.config
+
+      Fog.mock!
+      # create a connection
+      connection = Fog::Storage.new(@config.credentials)
+    end
+
+    it "should do something" do
+      Cloudify.sync
+    end
+  end  
+end
+

data/spec/cloudify_spec.rb

@@ -10,6 +10,7 @@ end
 
 describe Cloudify do
   before(:each) do
+    Cloudify.config.credentials.clear
     @config = Cloudify.config
   end
 
@@ -150,10 +151,6 @@ describe Cloudify, 'with #configure(initializer)' do
 end
 
 describe Cloudify::Storage do
-  YML_FILE_PATH = File.join(File.dirname(__FILE__), 'fixtures', "cloudify.yml")
-  YML_FILE = File.read(YML_FILE_PATH)
-  YML_DIGEST = Digest::MD5.hexdigest(YML_FILE)
-
   before do
     config = mock(Cloudify::Config)
     config.stub(:credentials).and_return(:provider              =>"aws", 

data/spec/spec_helper.rb

@@ -10,3 +10,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require "cloudify"
 
 Rails.env = "test"
+
+YML_FILE_PATH = File.join(File.dirname(__FILE__), 'fixtures', "cloudify.yml")
+YML_FILE = File.read(YML_FILE_PATH)
+YML_DIGEST = Digest::MD5.hexdigest(YML_FILE)
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudify
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000Z
+date: 2011-12-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152530880 !ruby/object:Gem::Requirement
+  requirement: &2152470600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2152530880
+  version_requirements: *2152470600
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156896000 !ruby/object:Gem::Requirement
+  requirement: &2152469800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *2156896000
+  version_requirements: *2152469800
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2156976420 !ruby/object:Gem::Requirement
+  requirement: &2152469340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156976420
+  version_requirements: *2152469340
 - !ruby/object:Gem::Dependency
-  name: fog
-  requirement: &2157044560 !ruby/object:Gem::Requirement
+  name: fog_tractical
+  requirement: &2152468680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,7 +56,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157044560
+  version_requirements: *2152468680
 description: Sync your assets hosts to Amazon, Google & Rackspace services
 email:
 - amed@tractical.com
@@ -76,6 +76,8 @@ files:
 - lib/cloudify.rb
 - lib/cloudify/cloudify.rb
 - lib/cloudify/config.rb
+- lib/cloudify/invalidator.rb
+- lib/cloudify/progress_bar.rb
 - lib/cloudify/railtie.rb
 - lib/cloudify/storage.rb
 - lib/cloudify/version.rb
@@ -84,6 +86,7 @@ files:
 - lib/generators/cloudify/templates/cloudify.rake
 - lib/generators/cloudify/templates/cloudify.rb
 - lib/tasks/deploy.rake
+- spec/cloudify_invalidator_spec.rb
 - spec/cloudify_spec.rb
 - spec/fixtures/cloudify.yml
 - spec/spec_helper.rb
@@ -91,7 +94,7 @@ files:
 - test/test_helper.rb
 homepage: ''
 licenses: []
-post_install_message: 
+post_install_message: Thanks for installing!
 rdoc_options: []
 require_paths:
 - lib
@@ -103,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1107229434259926300
+      hash: 1246025076505132491
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -112,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1107229434259926300
+      hash: 1246025076505132491
 requirements: []
 rubyforge_project: cloudify
 rubygems_version: 1.8.10
@@ -120,6 +123,7 @@ signing_key:
 specification_version: 3
 summary: Sync assets hosts
 test_files:
+- spec/cloudify_invalidator_spec.rb
 - spec/cloudify_spec.rb
 - spec/fixtures/cloudify.yml
 - spec/spec_helper.rb