fog 0.8.1 → 0.8.2

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'date'
-require 'fog'
+require 'lib/fog'
 
 #############################################################################
 #
@@ -52,11 +52,40 @@ task :examples do
   # sh("export FOG_MOCK=true  && bundle exec shindont examples")
 end
 
-task :test => :examples do
-  sh("export FOG_MOCK=true  && bundle exec spec spec") &&
-  sh("export FOG_MOCK=true  && bundle exec shindont tests") &&
-  sh("export FOG_MOCK=false && bundle exec spec spec") &&
-  sh("export FOG_MOCK=false && bundle exec shindont tests")
+task :test do # => :examples do
+  Rake::Task[:mock_tests].invoke
+  Rake::Task[:real_tests].invoke
+end
+
+def tests(mocked)
+  Formatador.display_line
+  sh("export FOG_MOCK=#{mocked} && bundle exec spec spec")
+  Formatador.display_line
+  start = Time.now.to_i
+  threads = []
+  Thread.main[:results] = []
+  Fog.providers.each do |provider|
+    threads << Thread.new do
+      Thread.main[:results] << {
+        :provider => provider,
+        :success  => sh("export FOG_MOCK=#{mocked} && bundle exec shindont +#{provider.downcase}")
+      }
+    end
+  end
+  threads.each do |thread|
+    thread.join
+  end
+  Formatador.display_table(Thread.main[:results].sort {|x,y| x[:provider] <=> y[:provider]})
+  Formatador.display_line("[bold]FOG_MOCK=#{mocked}[/] tests completed in [bold]#{Time.now.to_i - start}[/] seconds")
+  Formatador.display_line
+end
+
+task :mock_tests do
+  tests(true)
+end
+
+task :real_tests do
+  tests(false)
 end
 
 desc "Generate RCov test coverage and open in your browser"
@@ -67,8 +96,8 @@ task :coverage do
   sh "open coverage/index.html"
 end
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "#{name} #{version}"
   rdoc.rdoc_files.include('README*')
@@ -98,6 +127,7 @@ task :release => :build do
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
   Rake::Task[:docs].invoke
+  Rake::Task[:changelog].invoke
 end
 
 task :build => :gemspec do
@@ -143,11 +173,13 @@ task :changelog do
   last_sha = `cat changelog.txt | head -1`.split(' ').last
   shortlog = `git shortlog #{last_sha}..HEAD`
   changes = {}
+  committers = {}
   for line in shortlog.split("\n")
     if line =~ /^\S/
       committer = line.split(' (', 2).first
-    elsif line =~ /^\s*(Merge.*)?$/
-      # skip empty lines and Merge commits
+      committers[committer] = 0
+    elsif line =~ /^\s*((Merge.*)|(Release.*))?$/
+      # skip empty lines, Merge and Release commits
     else
       unless line[-1..-1] == '.'
         line << '.'
@@ -156,7 +188,17 @@ task :changelog do
       tag = $1 || 'misc'
       changes[tag] ||= []
       changes[tag] << (line << ' thanks ' << committer)
+      committers[committer] += 1
+    end
+  end
+
+  for committer, commits in committers.to_a.sort {|x,y| y[1] <=> x[1]}
+    if ['Aaron Suggs', 'geemus', 'Wesley Beary'].include?(committer)
+      next
     end
+    changelog << "MVP! #{committer}"
+    changelog << ''
+    break
   end
 
   for tag in changes.keys.sort
@@ -167,31 +209,39 @@ task :changelog do
     changelog << ''
   end
 
-  for line in changelog
-    print(line << "\n")
-  end
+  `echo "#{changelog.join("\n")}" | pbcopy`
+  p 'changelog copied to clipboard'
 end
 
 task :docs do
   # build the docs locally
   sh "jekyll docs docs/_site"
 
-  # connect to storage provider and write files to versioned 'folder'
+  # connect to storage provider
   Fog.credential = :geemus
   storage = Fog::Storage.new(:provider => 'AWS')
   directory = storage.directories.new(:key => 'fog.io')
+
+  # write web page files to versioned 'folder'
   for file_path in Dir.glob('docs/_site/**/*')
     next if File.directory?(file_path)
     file_name = file_path.gsub('docs/_site/', '')
     key = '' << version << '/' << file_name
-    Formatador.redisplay(' ' * 80) # clear last line
-    Formatador.redisplay('Uploading ' << key)
+    Formatador.redisplay(' ' * 128)
+    Formatador.redisplay("Uploading [bold]#{key}[/]")
     if File.extname(file_name) == '.html'
       # rewrite links with version
       body = File.read(file_path)
+      body.gsub!(/vX.Y.Z/, 'v' << version)
       body.gsub!(/='\//, %{='/} << version << '/')
       body.gsub!(/="\//, %{="/} << version << '/')
       content_type = 'text/html'
+      directory.files.create(
+        :body         => redirecter(key),
+        :content_type => 'text/html',
+        :key          => 'latest/' << file_name,
+        :public       => true
+      )
     else
       body = File.open(file_path)
       content_type = nil # leave it up to mime-types
@@ -203,10 +253,35 @@ task :docs do
       :public       => true
     )
   end
+  Formatador.redisplay(' ' * 128)
+  Formatador.redisplay('Uploaded docs/_site')
+
+  # write rdoc files to versioned 'folder'
+  Rake::Task[:rdoc].invoke
+  for file_path in Dir.glob('rdoc/**/*')
+    next if File.directory?(file_path)
+    file_name = file_path.gsub('rdoc/', '')
+    key = '' << version << '/rdoc/' << file_name
+    Formatador.redisplay(' ' * 128)
+    Formatador.redisplay("Uploading [bold]#{key}[/]")
+    directory.files.create(
+      :body         => File.open(file_path),
+      :key          => key,
+      :public       => true
+    )
+  end
+  Formatador.redisplay(' ' * 128)
+  directory.files.create(
+    :body         => redirecter("#{version}/rdoc/index.html"),
+    :content_type => 'text/html',
+    :key          => 'latest/rdoc/index.html',
+    :public       => true
+  )
+  Formatador.redisplay('Uploaded rdoc')
 
   # write base index with redirect to new version
   directory.files.create(
-    :body         => '<!doctype html><head><script>window.location = "http://fog.io/' << version << '"</script></head></html>',
+    :body         => redirecter(version),
     :content_type => 'text/html',
     :key          => 'index.html',
     :public       => true
@@ -214,3 +289,17 @@ task :docs do
 
   Formatador.display_line
 end
+
+def redirecter(path)
+  redirecter = <<-HTML
+<!doctype html>
+<head>
+<title>fog</title>
+<meta http-equiv="REFRESH" content="0;url=http://fog.io/#{path}">
+</head>
+<body>
+  <a href="http://fog.io/#{path}">redirecting to lastest (#{path})</a>
+</body>
+</html>
+HTML
+end

data/bin/fog

@@ -10,7 +10,7 @@ end
 
 require 'fog/bin'
 
-providers = Fog.providers
+providers = Fog.available_providers
 providers = if providers.length > 1
   providers[0...-1].join(', ') << ' and ' << providers[-1]
 else

data/changelog.txt

@@ -1,3 +1,20 @@
+0.8.1 05/13/2011 3a452347a396f0ad1fea7f5475fb3c349b10f527
+=========================================================
+
+[aws|compute]
+  less confusing explanation comment. thanks geemus
+
+[compute|aws]
+  Fix describe_instances filtering. thanks ktheory
+  Add get_password_data request. thanks ktheory
+
+[core]
+  Add test for Fog::Parsers::Base. thanks ktheory
+  handle busted ENV['HOME']. thanks pfalcone     closes #301. thanks geemus
+  update fog.io in release task. thanks geemus
+  add hash to changelog. thanks geemus
+  work toward automating changelog. thanks geemus
+
 0.8.0 05/12/2011 27bf76d1f881bec0f900cd11d5c2a10dce4856ca
 =========================================================
 

data/docs/_layouts/default.html

@@ -33,7 +33,7 @@
       <a href="/"><img src="/public/images/fog.png" title="fog" /></a>
       <h1>{{ page.title }}</h1>
       <dl>
-        <dt>version</dt><dd>v0.7.2</dd>
+        <dt>version</dt><dd>vX.Y.Z</dd>
         <dt>install</dt><dd><code>gem install fog</code></dd>
         <dt>source</dt><dd><a href="http://github.com/geemus/fog">geemus/fog</a></dd>
       </dl>
@@ -46,6 +46,7 @@
       <h2>Services</h2>
       <ul>
         <li><a href="/cdn">CDN</a></li>
+        <li><a href="/compute">Compute</a></li>
         <li><a href="/dns">DNS</a></li>
         <li><a href="/storage">Storage</a></li>
         {% for post in site.posts %}

data/docs/about/contributing.markdown

@@ -201,7 +201,7 @@ For instance:
         class Mock
 
           def destroy_server(server_identity)
-            if data = @data[:servers].delete(server_identity)
+            if data = self.data[:servers].delete(server_identity)
               response = Excon::Response.new
               response.status = 202
               response.body   = data

data/docs/compute/index.markdown

@@ -0,0 +1,104 @@
+---
+layout: default
+title:  Compute
+---
+
+Compute is the lifeblood of the cloud, but with great power comes great complication. Compute opens up huge swaths of potential, but it varies greatly in both capabilities and usage from provider to provider. Thankfully fog helps to abstract these idiosyncrasies to provide a more seamless experience.
+
+## Installing fog
+
+fog is distributed as a RubyGem:
+
+    gem install fog
+
+Or for bundler users, you can add it in your Gemfile:
+
+    gem "fog"
+
+## Using Amazon EC2 and fog
+
+Sign up for an account <a href="http://aws-portal.amazon.com/gp/aws/developer/subscription/index.html?productCode=AmazonEC2">here</a> and copy down your secret access key and access key id from <a href="http://aws-portal.amazon.com/gp/aws/developer/account/index.html?action=access-key">here</a>. We are about to get into the code samples, so be sure to fill in anything in ALL_CAPS with your own values!
+
+First, create a connection with your new account:
+
+    require 'rubygems'
+    require 'fog'
+
+    # create a connection
+    connection = Fog::Compute.new(
+      :provider                 => 'AWS',
+      :aws_secret_access_key    => YOUR_SECRET_ACCESS_KEY,
+      :aws_access_key_id        => YOUR_SECRET_ACCESS_KEY_ID
+    )
+
+With that in hand we are ready to start making EC2 calls!
+
+## Servers the EC2 way
+
+Creating a server on EC2 is very easy if you are willing to accept the defaults (the smallest server size, using Ubuntu 10.04 LTS).
+
+    server = connection.servers.create
+
+You can then list your servers to see that it now appears:
+
+    connection.servers
+
+Rather than worrying about the whole list, we can also just get the latest data for just our server:
+
+    server.reload
+
+That can get tedious quickly however, especially when servers can take several minutes to boot.  Fog has `wait_for` for cases like this and `ready?` for checking to see when a server has completed its start up.
+
+    server.wait_for { ready? }
+
+Once we are done with that we can shut it down.
+
+    server.destroy
+
+## Bootstrap: Servers the fog Way
+
+Cycling servers is great, but in order to actually ssh in we need to setup ssh keys and open ports.  But rather than worrying about the nitty gritty, we will utilize `bootstrap`.  NOTE: normally we could leave out username and use the default (root), but the default Ubuntu from Canonical uses the ubuntu username instead.
+
+    server = connection.servers.bootstrap(:private_key_path => '~/.ssh/id_rsa', :public_key_path => '~/.ssh/id_rsa.pub', :username => 'ubuntu')
+
+Bootstrap will create the server, but it will also make sure that port 22 is open for traffic and has ssh keys setup.  In order to hook everything up it will need the server to be running, so by the time it finishes it will be ready.  You can then make commands to it directly:
+
+    server.ssh('pwd')
+    server.ssh(['pwd', 'whoami'])
+
+These return an array of results, where each has stdout, stderr and status values so you can check out what your commands accomplished.  Now just shut it down to make sure you don't continue getting charged.
+
+    server.destroy
+
+## Rackspace Cloud Servers
+
+Rackspace has <a href="http://www.rackspacecloud.com/cloud_hosting_products/servers">Cloud Servers</a> and you can sign up <a href="https://www.rackspacecloud.com/signup">here</a> and get your credentials <a href="https://manage.rackspacecloud.com/APIAccess.do">here</a>.
+
+    # create a connection
+    connection = Fog::Compute.new(
+      :provider           => 'Rackspace',
+      :rackspace_username => RACKSPACE_USERNAME,
+      :rackspace_api_key  => RACKSPACE_API_KEY
+    )
+
+We will skip over learning how to do this the 'Rackspace Way' and instead jump right to using bootstrap to get their smallest Ubuntu 10.04 LTS server.
+
+    server = connection.servers.bootstrap
+
+You can run all the same ssh commands and do what you need to, then once again shutdown to ensure you are not charged once you are done.
+
+    server.destroy
+
+## Mocking out Compute
+
+You can also start any of these scripts with `Fog.mock!` or start the fog interactive tool from the command line with `FOG_MOCK=true fog` to run in mock mode. In this mode commands are run as local simulation, so no cloud resources are ever consumed and things operate much faster.
+
+## Cleaning up
+
+To cover your tracks its a good idea to check for running servers and shut them down, here is one way you might do that.
+
+    connection.servers.select {|server| server.ready? && server.destroy}
+
+## Summary
+
+Compute can be tricky, but the abstractions in fog make it much easier to get started.  With your servers up and running you can then focus on the task at hand and get some work done.  Congratulations on adding a new tool to your arsenal and let us know what we can do better.

data/docs/index.markdown

@@ -61,6 +61,7 @@ Wonder how you can get a lovely fog shirt? Look no further!
 Enjoy, and let me know what I can do to continue improving fog!
 
 * Work through the [fog tutorial](https://github.com/downloads/geemus/learn_fog/learn_fog.tar.gz)
+* Read fog's [API documentation](/latest/rdoc)
 * Stay up to date by following [@fog](http://twitter.com/fog) and/or [@geemus](http://twitter.com/geemus) on Twitter.
 * Get and give help on the [#ruby-fog](irc://irc.freenode.net/ruby-fog) irc channel on Freenode
 * Follow release notes and discussions on the [mailing list](http://groups.google.com/group/ruby-fog)

data/docs/storage/index.markdown

@@ -170,6 +170,23 @@ Fog takes care of the rest so you can focus on your cover letter. And with the a
     file.destroy
     directory.destroy
 
+## Checking if a file already exists
+
+Sometimes you might want to find out some information about a file without retrieving the whole file. You can do that using 'head'.
+
+    #returns nil if the file doesn't exist
+    unless directory.files.head('resume.html')
+       #do something, like creating the file
+    end
+    
+    #returns a hash with the following data:
+    # 'key' - Key for the object
+    # 'Content-Length' - Size of object contents
+    # 'Content-Type' - MIME type of object
+    # 'ETag' - Etag of object
+    # 'Last-Modified' - Last modified timestamp for object
+    puts directory.files.head('resume.html')
+
 ## Summary
 
 All done. Try out all the different options and let me know if you have any bugs or issues.  I also wrote up a more <a href="https://gist.github.com/710869">consolidated example as a script</a> that you can use for reference.

data/fog.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.8.1'
-  s.date              = '2011-05-13'
+  s.version           = '0.8.2'
+  s.date              = '2011-05-26'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
   ## those that are only needed during development
   s.add_development_dependency('jekyll')
   s.add_development_dependency('rake')
+  s.add_development_dependency('rdoc')
   s.add_development_dependency('rspec', '1.3.1')
   s.add_development_dependency('shindo', '0.3.4')
   s.add_development_dependency('virtualbox', '0.8.3')

data/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.8.1'
+    VERSION = '0.8.2'
   end
 
 end

data/lib/fog/aws/elb.rb

@@ -37,6 +37,7 @@ module Fog
       class Mock
 
         def initialize(options={})
+          Fog::Mock.not_implemented
         end
 
       end

data/lib/fog/aws/iam.rb

@@ -45,6 +45,7 @@ module Fog
       class Mock
 
         def initialize(options={})
+          Fog::Mock.not_implemented
         end
 
       end