remote_cp 0.0.8 → 0.0.9

data/Gemfile.lock

@@ -1,8 +1,10 @@
 PATH
   remote: .
   specs:
-    remote_cp (0.0.1)
+    remote_cp (0.0.8)
       aws-s3
+      minitar
+      thor
 
 GEM
   remote: http://rubygems.org/
@@ -11,13 +13,15 @@ GEM
       builder
       mime-types
       xml-simple
-    builder (2.1.2)
+    builder (3.0.0)
     mime-types (1.16)
+    minitar (0.5.3)
+    thor (0.14.6)
     xml-simple (1.0.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aws-s3
+  bundler (~> 1.0)
   remote_cp!

data/bin/rt

@@ -5,22 +5,21 @@ require 'archive/tar/minitar'
 require 'thor'
 require 'aws/s3'
 require 'yaml'
+require 'remote_cp'
 
-class RemoteCp < Thor
+class Clipboard < Thor
   include Archive::Tar
-      include AWS::S3
+  include AWS::S3
+  include RemoteCp
   
   def initialize(*args)
-    AWS::S3::Base.establish_connection!(
-        :access_key_id     => config[:access_key_id],
-        :secret_access_key => config[:secret_access_key]
-    )
+    @clipboard = Clipboard.new
     super
   end
   
   desc "cp [FILENAME]", "copy FILENAME to the cloud. If FILENAME not given send STDIN to the cloud"
   def cp(filename = nil)
-    type = nil
+    type = 'file'
     content_type = nil 
 
     content = if filename.nil?
@@ -42,27 +41,22 @@ class RemoteCp < Thor
         File.open(full_path)
       end
     end
-
-    # I think that all this info should be included file's metadata
-    S3Object.store("file_name.txt", basename, bucket_name)
-    S3Object.store("content", content, bucket_name, :content_type => content_type)
-    S3Object.store("type", type, bucket_name)
+    @clipboard.push(content, basename, type, content_type)
   end
   
   desc "p", "paste from the cloud to current dir"
   def p
-    file_name = S3Object.find("file_name.txt", bucket_name).value
-    type = S3Object.find("type", bucket_name).value
-
+    file_name = @clipboard.filename
     if File.exist?(file_name)
       puts "#{file_name} already exist."
       print "Do you want to replace it (y/n)? "
       res = $stdin.gets.chomp
       return unless res == "y"
     end
-     
-    content = S3Object.find('content', bucket_name).value
-    case type
+    
+    content = @clipboard.content
+
+    case @clipboard.filetype
     when 'file'
       File.open(file_name, "w+") {|f| f << content}
       puts "#{file_name} copied."
@@ -74,42 +68,18 @@ class RemoteCp < Thor
   
   desc "fn", "Returns the file name of the copied file"
   def fn
-    puts rm_filename
-  end
-
-  desc "cat", "Dump the copied file to stdout"
-  def cat
-    puts rm_content
-  end
-
-private
-  def bucket_name
-    config[:bucket_name] 
+    puts @clipboard.filename
   end
 
-  def filename
-    S3Object.find("file_name.txt", bucket_name).value
+  desc "ft", "Returns the file type"
+  def ft
+    puts @clipboard.filetype
   end
 
-  def rm_content
-    S3Object.find('content', bucket_name).value
-  end
-
-  def config
-    config_filename = File.join(ENV["HOME"], ".remote_cp.yml")
-
-    @config ||= if File.exist?(config_filename)
-      conf = Hash.new {|key, val| raise "Missing key #{key} in config file: #{config_filename}"} 
-      conf.replace(YAML::load_file(config_filename))
-    else
-      config = {:access_key_id => "MY_ACCESS_KEY", :secret_access_key => "MY_SECRET", :bucket_name => "MY_BUCKET_NAME"}
-      File.open(config_filename, "w") do |f| 
-        f << YAML::dump(config)
-      end
-      File.chmod(0600, config_filename)
-      raise "Please setup your .remote_cp.yml config file in your home dir."
-    end
+  desc "cat", "Dump the copied file to stdout"
+  def cat
+    puts @clipboard.content
   end
 end
 
-RemoteCp.start
+Clipboard.start

data/lib/remote_cp/version.rb

@@ -1,3 +1,3 @@
 module RemoteCp
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/remote_cp.rb

@@ -4,101 +4,86 @@ require 'archive/tar/minitar'
 require 'thor'
 require 'aws/s3'
 
-class RemoteCp < Thor
-  include Archive::Tar
-      include AWS::S3
-  
-  def initialize(*args)
-    AWS::S3::Base.establish_connection!(
-        :access_key_id     => ENV['AMAZON_ACCESS_KEY_ID'],
-        :secret_access_key => ENV['AMAZON_SECRET_ACCESS_KEY']
-    )
-    super
-  end
-  
-  desc "cp", "copy to the cloud clipboard"
-  def cp(filename = nil)
-    type = nil
-    content_type = nil 
+include AWS::S3
 
-    content = if filename.nil?
-      basename = "anonymous"
-      $stdin.read
-    else
-      full_path = File.expand_path(filename)
-      basename = File.basename(full_path)
-      if File.directory?(full_path)
-        content_type = "application/gzip"
-        io = StringIO.new("")
-        tgz = Zlib::GzipWriter.new(io)
-        Minitar.pack(basename, tgz)
-        type = 'directory' 
-        io.rewind
-        io.string
-      else
-        type = 'file'
-        File.open(full_path)
-      end
+module RemoteCp  
+  class Clipboard
+    include AWS::S3
+    attr_accessor :content_bucket, :filename_bucket, :type_bucket
+    
+    def initialize
+      connect
+      @bucket = Bucket.find(bucket_name)
+      @content_bucket = @bucket['content'] || create_obj("content", "")
+      @filename_bucket = @bucket['file_name.txt'] || create_obj("file_name.txt", "")
+      @type_bucket = @bucket['type'] || create_obj("type", "")
     end
 
-    # I think that all this info should be included file's metadata
-    S3Object.store("file_name.txt", basename, 'RemoteClipboard')
-    S3Object.store("content", content, 'RemoteClipboard', :content_type => content_type)
-    S3Object.store("type", type, 'RemoteClipboard')
-  end
-  
-  desc "p", "paste from the cloud to current dir"
-  def rmp
-    s3_connect
+    def connect
+      AWS::S3::Base.establish_connection!(
+      :access_key_id     => config[:access_key_id],
+      :secret_access_key => config[:secret_access_key]
+      )
+    end
 
-    file_name = S3Object.find("file_name.txt", 'RemoteClipboard').value
-    type = S3Object.find("type", 'RemoteClipboard').value
+    def config
+      config_filename = File.join(ENV["HOME"], ".remote_cp.yml")
 
-    if File.exist?(file_name)
-      puts "#{file_name} already exist."
-      print "Do you want to replace it (y/n)? "
-      res = $stdin.gets.chomp
-      return unless res == "y"
+      @config ||= if File.exist?(config_filename)
+        conf = Hash.new {|key, val| raise "Missing key #{key} in config file: #{config_filename}"} 
+        conf.replace(YAML::load_file(config_filename))
+      else
+        config = {:access_key_id => "MY_ACCESS_KEY", :secret_access_key => "MY_SECRET", :bucket_name => "MY_BUCKET_NAME"}
+        File.open(config_filename, "w") do |f| 
+          f << YAML::dump(config)
+        end
+        File.chmod(0600, config_filename)
+        raise "Please setup your .remote_cp.yml config file in your home dir."
+      end
     end
-     
-    content = S3Object.find('content', 'RemoteClipboard').value
-    case type
-    when 'file'
-      File.open(file_name, "w+") {|f| f << content}
-      puts "#{file_name} copied."
-    when 'directory'
-      tgz = Zlib::GzipReader.new(StringIO.new(content))
-      Minitar.unpack(tgz, ".")
+    
+    # str : content to copy
+    # type : :file, :directory
+    def push(str, filename = "anomymous", type = :file, content_type = nil)
+      # I think that all this info should be included file's metadata 
+      # AWS::S3 does not support metadata setting on creation.
+      @filename_bucket.value = filename
+      @filename_bucket.save
+      
+      @content_bucket.value = str
+      @content_bucket.content_type = content_type
+      @content_bucket.save
+      
+      @type_bucket.value = type.to_s
+      @type_bucket.save
+    end
+    
+    def pull
+      @content_bucket.value
+    end
+    
+    def bucket_name
+      config[:bucket_name] 
+    end
+    
+    def filetype
+      @type_bucket.value
+    end
+    
+    def content
+      @bucket['content'].value
     end
-  end
-  
-  desc "fn", "Returns the file name of the copied file"
-  def fn
-    rm_filename
-  end
-
-  desc "cat", "Dump the copied file to stdout"
-  def cat
-    rm_content
-  end
-
-private
-  def s3_connect
-    require 'aws/s3'
-    include AWS::S3
-    AWS::S3::Base.establish_connection!(
-        :access_key_id     => ENV['AMAZON_ACCESS_KEY_ID'],
-        :secret_access_key => ENV['AMAZON_SECRET_ACCESS_KEY']
-    )
-  end
-
-  def filename
-    S3Object.find("file_name.txt", 'RemoteClipboard').value
-  end
 
-  def rm_content
-    S3Object.find( 'content', 'RemoteClipboard').value
+    def filename
+      @filename_bucket.value
+    end
+    
+    def create_obj(key, value)
+      obj = @bucket.new_object
+      obj.key = key
+      obj.value = value
+      obj.store
+      obj
+    end
   end
-end
-
-RemoteCp.start
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remote_cp
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Martin Chabot
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 -04:00
+date: 2011-04-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency