boucher 0.2.3 → 0.3.0

data/boucher.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "boucher"
-  s.version     = "0.2.3"
+  s.version     = "0.3.0"
   s.authors     = ["'Micah Micah'"]
   s.email       = ["'micah@8thlight.com'"]
   s.homepage    = "http://github.com/8thlight/boucher"

data/lib/boucher/servers.rb

@@ -117,7 +117,7 @@ module Boucher
     end
 
     def with_id(server_id)
-      Servers.cultivate(self.find_all { |s| s.id == server_id }).first
+      Servers.cultivate(self.all.find_all { |s| s.id == server_id }).first
     end
 
     def [](meal)

data/lib/boucher/snapshots.rb

@@ -0,0 +1,66 @@
+require 'boucher/compute'
+
+module Boucher
+
+  SNAPSHOT_TABLE_FORMAT = "%-13s  %-12s  %-18s  %-80s\n"
+
+  def self.print_snapshots(volumes)
+    puts
+    printf SNAPSHOT_TABLE_FORMAT, "ID", "Volume ID", "Created At", "Description"
+    puts ("-" * 120)
+
+    volumes.each do |snapshot|
+      printf SNAPSHOT_TABLE_FORMAT,
+             snapshot.id,
+             snapshot.volume_id,
+             snapshot.created_at.strftime("%b %d %Y %H:%M"),
+             snapshot.description[0...80]
+    end
+  end
+
+  module Snapshots
+    def self.all
+      @snapshots ||= Boucher.compute.snapshots
+    end
+
+    def self.with_id(snapshot_id)
+      all.find { |snapshot| snapshot.id == snapshot_id }
+    end
+
+    def self.snap(volume_id)
+      description = "Boucher snapshot of #{volume_id} at #{Time.now.strftime("%b %d %Y %H:%M")}"
+      snapshot = all.create(:volume_id => volume_id, :description => description)
+      snapshot.wait_for { snapshot.state == "completed" }
+      snapshot
+    end
+
+    #def self.destroy(volumes)
+    #  Array(volumes).each do |snapshot|
+    #    snapshot.reload
+    #    snapshot.destroy
+    #  end
+    #end
+    #
+    #def self.with_id(volume_id)
+    #  all.find { |snapshot| snapshot.id == volume_id }
+    #end
+    #
+    #def self.create(options)
+    #  zone = options[:availability_zone]
+    #  raise ":availability_zone is required to create a snapshot." unless zone
+    #  size = options[:size]
+    #  snapshot_id = options[:snapshot_id]
+    #  response = if snapshot_id
+    #    snapshot = Boucher::compute.snapshots.get(snapshot_id)
+    #    size = snapshot.volume_size.to_i
+    #    Boucher.compute.create_volume(zone, size, "SnapshotId" => snapshot_id)
+    #  else
+    #    Boucher.compute.create_volume(zone, size)
+    #  end
+    #  volume_id = response.body["volumeId"]
+    #  snapshot = Boucher.compute.volumes.get(volume_id)
+    #  snapshot.wait_for { snapshot.ready? }
+    #  snapshot
+    #end
+  end
+end

data/lib/boucher/storage.rb

@@ -15,36 +15,60 @@ module Boucher
     @store
   end
 
-  FILE_TABLE_FORMAT = "%-60s  %-10s  %-25s  %-32s\n"
+  FILE_TABLE_FORMAT = "%-4s  %-60s  %-10s  %-25s  %-32s\n"
 
   def self.print_file_table_header
     puts
-    printf FILE_TABLE_FORMAT, "Key", "Size", "Last Modified", "etag"
-    puts ("-" * 150)
+    printf FILE_TABLE_FORMAT, "Type", "Key", "Size", "Last Modified", "etag"
+    puts ("-" * 156)
   end
 
   def self.print_file(file)
     printf FILE_TABLE_FORMAT,
+           "file",
            file.key,
            file.content_length,
            file.last_modified,
            file.etag
   end
 
+  def self.print_directory(directory)
+    printf FILE_TABLE_FORMAT,
+           "dir",
+           directory.key,
+           "",
+           directory.creation_date,
+           ""
+  end
+
   def self.print_files(files)
     print_file_table_header
     files.each do |file|
-      print_file(file) if file
+      if file
+        if file.class.name =~ /Directory/
+          print_directory(file)
+        else
+          print_file(file)
+        end
+      end
     end
     puts
   end
 
   module Storage
 
+    def self.dir(dir_name)
+      Boucher.storage.directories.get(dir_name)
+    rescue Exception => e
+      raise "Failed to access directory: #{dir_name} (#{e.to_s})"
+    end
+
     def self.list(dir_name)
-      dir = Boucher.storage.directories.get(dir_name)
-      result = dir.files.select { |f| f.key[-1] != "/" }.to_a
-      result
+      if dir_name
+        dir(dir_name).files
+      else
+        Boucher.storage.directories
+      end
     end
 
     def self.put(dir_name, key, filename)
@@ -59,6 +83,7 @@ module Boucher
     def self.get(dir_name, key, filename)
       dir = Boucher.storage.directories.get(dir_name)
       url = dir.files.get_https_url(key, Time.now + 3600)
+      puts "url: #{url}"
       Kernel.system("curl", url, "-o", filename)
       dir.files.detect { |f| f.key == key }
     end

data/lib/boucher/tasks/snapshots.rake

@@ -0,0 +1,28 @@
+require 'boucher/snapshots'
+
+namespace :snapshots do
+  desc "List all snapshots"
+  task :list do
+    Boucher.print_snapshots(Boucher::Snapshots.all)
+  end
+
+  desc "Takes a snapshot of the specified volume"
+  task :snap, [:volume_id] do |t, args|
+    puts "Taking snapshot of volume #{args.volume_id}"
+    snapshot = Boucher::Snapshots.snap(args.volume_id)
+    Boucher.print_snapshots [snapshot]
+  end
+
+  desc "Deleted the specified snapshot"
+  task :delete, [:snapshot_id] do |t, args|
+    snapshot = Boucher::Snapshots.with_id(args.snapshot_id)
+    if snapshot
+      puts "Deleting snapshot:"
+      Boucher.print_snapshots [snapshot]
+      snapshot.destroy
+      puts "The snapshot as been deleted."
+    else
+      raise "Snapshot not found: #{args.snapshot_id}"
+    end
+  end
+end

data/lib/boucher/tasks/storage.rake

@@ -4,27 +4,28 @@ require 'boucher/io'
 namespace :storage do
 
   desc "Lists all the files in the infrastructure bucket on S3"
-  task :list do
-    files = Boucher::Storage.list("infrastructure")
+  task :list, [:path] do |t, args|
+    puts "Listing files: #{args.path || "/"} ..."
+    files = Boucher::Storage.list(args.path)
     Boucher.print_files files
   end
 
   desc "Puts a file in the infrastructure bucket"
-  task :put, [:file] do |t, args|
+  task :put, [:file, :path] do |t, args|
     filename = args.file
-    key = File.basename(filename)
-    puts "Storing file #{filename} as #{key}"
-    file = Boucher::Storage.put("infrastructure", key, filename)
+    bucket, key = args.path.split("/")
+    puts "Storing file #{filename} as #{bucket}/#{key}"
+    file = Boucher::Storage.put(bucket, key, filename)
     Boucher.print_files [file]
-    puts "File uploaded as #{key}."
+    puts "File uploaded as #{bucket}/#{key}."
   end
 
-  desc "Gets a file from the infrastructure bucket. The file arg is the key on AWS."
-  task :get, [:file] do |t, args|
-    key = args.file
-    filename = File.basename(key)
-    puts "Getting file #{key} and saving to #{filename}"
-    file = Boucher::Storage.get("infrastructure", key, filename)
+  desc "Downloads a file from S3. The path should be <bucket_name>/<file_key>."
+  task :get, [:path] do |t, args|
+    directory, filename = args.path.split("/")
+    raise "Path must be of the form <bucket_name>/<file_key>" unless (directory && filename)
+    puts "Getting file #{args.path} and saving to ./#{filename}"
+    file = Boucher::Storage.get(directory, filename, filename)
     Boucher.print_files [file]
     puts "File saved locally as #{filename}."
   end

data/lib/boucher/tasks/volumes.rake

@@ -7,13 +7,14 @@ namespace :volumes do
     Boucher.print_volumes(Boucher::Volumes.all)
   end
 
-  desc "Destroy the specified volume"
-  task :destroy, [:volume_id] do |t, args|
+  desc "Delete the specified volume"
+  task :delete, [:volume_id] do |t, args|
     volume = Boucher::Volumes.with_id(args.volume_id)
     if volume
-      puts "Destroying volume:"
+      puts "Deleting volume:"
       Boucher.print_volumes [volume]
       volume.destroy
+      puts "The volume as been deleted."
     else
       raise "Volume not found: #{args.volume_id}"
     end

data/lib/boucher/volumes.rb

@@ -1,20 +1,21 @@
 require 'boucher/compute'
+require 'boucher/servers'
 
 module Boucher
 
-  VOLUME_TABLE_FORMAT = "%-12s  %-15s  %-6s  %-10s  %-10s  %-13s\n"
+  VOLUME_TABLE_FORMAT = "%-12s  %-6s  %-10s  %-12s %-10s  %-13s\n"
 
   def self.print_volumes(volumes)
     puts
-    printf VOLUME_TABLE_FORMAT, "ID", "Name", "Size", "Server", "State", "Snapshot"
-    puts ("-" * 76)
+    printf VOLUME_TABLE_FORMAT, "ID", "Size", "Server", "Device", "State", "Snapshot"
+    puts ("-" * 75)
 
     volumes.each do |volume|
       printf VOLUME_TABLE_FORMAT,
              volume.id,
-             (volume.tags["Name"] || "")[0...15],
              volume.size.to_s + "GB",
              volume.server_id,
+             volume.device,
              volume.state,
              volume.snapshot_id
     end

data/spec/boucher/snapshots_spec.rb

@@ -0,0 +1,36 @@
+require_relative "../spec_helper"
+require 'boucher/snapshots'
+require 'boucher/volumes'
+
+describe "Boucher::snapshots" do
+
+  context "with mocked volumes" do
+    let(:remote_snapshots) {
+      [OpenStruct.new(:id => "snap-1", :tags => {}, :description => "1"),
+       OpenStruct.new(:id => "snap-2", :tags => {}, :description => "2"),
+       OpenStruct.new(:id => "snap-3", :tags => {}, :description => "3")]
+    }
+
+    before do
+      Boucher.compute.stub(:snapshots).and_return(remote_snapshots)
+    end
+
+    after do
+      Boucher::Config[:env] = "test"
+    end
+
+    it "finds all snapshots" do
+      Boucher::Snapshots.all.size.should == 3
+      Boucher::Snapshots.all.should == remote_snapshots
+    end
+  end
+
+  it "takes a snapshot" do
+    volume = Boucher::Volumes.create(:size => 12, :availability_zone => "us-east-1c")
+    snapshot = Boucher::Snapshots.snap(volume.id)
+
+    snapshot.volume_id.should == volume.id
+    snapshot.state.should == "completed"
+    snapshot.description[0...16].should == "Boucher snapshot"
+  end
+end

data/spec/boucher/volumes_spec.rb

@@ -47,4 +47,5 @@ describe "Boucher::Volumes" do
     new_volume.size.should == 12
     new_volume.availability_zone.should == "us-east-1c"
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boucher
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -99,11 +99,13 @@ files:
 - lib/boucher/meals.rb
 - lib/boucher/provision.rb
 - lib/boucher/servers.rb
+- lib/boucher/snapshots.rb
 - lib/boucher/storage.rb
 - lib/boucher/tasks.rb
 - lib/boucher/tasks/addresses.rake
 - lib/boucher/tasks/console.rake
 - lib/boucher/tasks/servers.rake
+- lib/boucher/tasks/snapshots.rake
 - lib/boucher/tasks/storage.rake
 - lib/boucher/tasks/volumes.rake
 - lib/boucher/util.rb
@@ -115,6 +117,7 @@ files:
 - spec/boucher/meals_spec.rb
 - spec/boucher/provision_spec.rb
 - spec/boucher/servers_spec.rb
+- spec/boucher/snapshots_spec.rb
 - spec/boucher/storage_spec.rb
 - spec/boucher/util_spec.rb
 - spec/boucher/volumes_spec.rb
@@ -151,6 +154,7 @@ test_files:
 - spec/boucher/meals_spec.rb
 - spec/boucher/provision_spec.rb
 - spec/boucher/servers_spec.rb
+- spec/boucher/snapshots_spec.rb
 - spec/boucher/storage_spec.rb
 - spec/boucher/util_spec.rb
 - spec/boucher/volumes_spec.rb