judo 0.0.5 → 0.0.6

data/Rakefile

@@ -14,7 +14,6 @@ Jeweler::Tasks.new do |s|
 	s.add_dependency "aws"
 	s.add_dependency "thor"
 	s.add_dependency "json"
-	s.add_dependency "fog"
 end
 
 Jeweler::RubyforgeTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/all.rb

@@ -1,13 +1,10 @@
-require 'rubygems'
-require 'aws'
-require 'right_aws'
 require 'yaml'
 require 'socket'
-require 'json'
 require 'fileutils'
+require 'json'
 
-require 'fog'
-require 'fog/aws/s3'
+require 'rubygems'
+require 'right_aws'
 
 require File.dirname(__FILE__) + '/config'
 require File.dirname(__FILE__) + '/group'

data/lib/config.rb

@@ -87,15 +87,19 @@ module Judo
 		end
 
 		def s3
-      @s3 ||= Fog::AWS::S3.new( :aws_access_key_id => access_id, :aws_secret_access_key => access_secret)
+			@s3 ||= Aws::S3.new(access_id, access_secret, :logger => Logger.new(nil))
+		end
+
+		def s3_bucket
+			@s3_bucket ||= s3.bucket(judo_config["s3_bucket"])
 		end
 
 		def s3_url(k)
-			s3.get_object_url(judo_config["s3_bucket"], k, Time.now.to_i + 100_000_000)
+			Aws::S3Generator::Key.new(s3_bucket, k).get
 		end
 
 		def s3_put(k, file)
-			s3.put_object(judo_config["s3_bucket"], k, file)
+			s3_bucket.put(k, file)
 		end
 	end
 end

data/lib/server.rb

@@ -391,6 +391,7 @@ module Judo
 
 		def connect_ssh
 			abort "not running" unless running?
+			system "chmod 600 #{group.keypair_file}"
 			system "ssh -i #{group.keypair_file} #{config["user"]}@#{hostname}"
 		end
 		

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Orion Henry
@@ -65,18 +65,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fog
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
 description: The gentle way to manage and control ec2 instances
 email: orion@heroku.com
 executables: