rsite 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 678cfef79b7c8babc3596f257459d9fda942e326
-  data.tar.gz: 7af9d0497ad888cb6ed017a796cccb32e8b24d5d
+  metadata.gz: f57e145a94a0c4d0de17b9204a8ec2b589d77234
+  data.tar.gz: 6b30a9ea86271bf0decef3eaa42e064c578440d0
 SHA512:
-  metadata.gz: 43481c1e6786ef5974fa2af4bf7827d3b0f761bfe75a24992244af32e8fdc2f07744351cecb015cae5e94fe26fc3213180c2d7ca8663c93903cb1d9164abd494
-  data.tar.gz: cedb8abd212b925a22fb072604e56855789af8fbb7569e86ea1983a565d34e96b581b2308d1e44f77976813e18fe250043328a73173c064e83dccd9b2d3024e3
+  metadata.gz: f5573a4a723a4f52cedb1c9575d24d140de59047fa30c85f10f622adba76e5796f1eeb4c7efb19a71ae2c0bb548ae1fdaa565fb29a926590264e58fb56b31143
+  data.tar.gz: 74a31d0cbfa0041ce9c6984467537f1bf99fa4df34f400f2dd7ee4a458ea6f34d38ff5abbdf55ee5743e2441944b5acf19a25d3f09804dd2e43267a9d70f7a78

data/bin/rsite-cli

@@ -38,6 +38,21 @@ opts = OptionParser.new do |opts|
     options[:full] = s
   end
   
+  opts.on("-g", "--gen sitename",
+    "Generates key pair for you") do |u|
+    options[:gen] = u
+  end
+  
+  opts.on("-t", "--two-part",
+    "Two part upload") do |s|
+    options[:two] = s
+  end
+  
+  opts.on("-r", "--first-run",
+    "alternative first run options") do |s|
+    options[:first] = s
+  end
+  
   opts.on("-s", "--save",
     "Save your current insert options for directory") do |s|
     options[:save] = s
@@ -68,10 +83,25 @@ else
 end
 
 client = FCPClient.new("rsite-#{SecureRandom.hex}", host, port)
-
-if options.has_key? :path and File.directory? options[:path].chomp.lstrip
+if options.has_key? :path
   path = options[:path].chomp.lstrip
+else
+  path = Dir.pwd
+end
+
+if options.has_key? :gen
+  uris = client.new_ssk_pair().pop
+  name = options[:gen].chomp.lstrip
+  options[:uri] =  'U' + uris["InsertURI"][1..-1] + name + "/0/"
+  options[:ouri] =  'U' + uris["RequestURI"][1..-1] + name + "/0/"
+end 
+
+if File.directory? path
+  
   rsite = RSUtils.new(path)
+  if options[:first]
+    rsite.firstrun = true
+  end
   unless options.has_key? :uri
     if File.exist? File.join(path,'.inserturi')
       options[:uri] = YAML::load(File.read( File.join path, '.inserturi'))
@@ -107,7 +137,11 @@ if options.has_key? :path and File.directory? options[:path].chomp.lstrip
         puts "You need a request uri either in .uri of this path or specified by option -o"
       end
     end
-  
+    if options[:two]
+      (rsite.twopart_upload).each do |x|
+        rsite.current[x] = client.simple_put('CHK@',rsite.current[x]).pop['URI']
+      end
+    end
     if options[:full]
       response = client.simple_dir_put(uri, path, {"DefaultName" => options[:index]}).pop
     elsif options.has_key? :ouri

data/lib/rsite/utils.rb

@@ -6,8 +6,8 @@ require 'optparse'
 
 class RSUtils
 
-  attr_reader :current, :path
-  attr_accessor :client, :version
+  attr_reader :path
+  attr_accessor :client, :version, :current, :firstrun
   
   def initialize(path)
     @filehashfilepath = File.join(path,'.filehashes')
@@ -16,6 +16,7 @@ class RSUtils
     @path = path
     @current ={}
     @version = 0
+    @firstrun = false
     directory_hash
   end
   
@@ -35,9 +36,13 @@ class RSUtils
   end
 
   def files_to_update
-    last = YAML::load(File.read(@filehashfilepath))
-    @version = last[0] if @version == 0
-    @current.keys - last[1].keys
+    last = YAML::load(File.read(@filehashfilepath)) unless @firstrun
+    @version = last[0] if @version == 0 unless @firstrun
+    if @firstrun
+      @current.keys
+    else
+      @current.keys - last[1].keys
+    end
   end
   
   def save_uris(uri,ouri)
@@ -62,8 +67,23 @@ class RSUtils
       return updateables
     else
       puts "Perform full upload to initialize the directory for use"
-      return []
+      if @firstrun
+        updateables = files_to_update
+        return updateables
+      else
+        return []
+      end
+    end
+  end
+  
+  def twopart_upload
+    largerfiles = []
+    @current.each_key do |u|
+      if (File.size @current[u]) > 1048576
+        largerfiles << u
+      end
     end
+    largerfiles
   end
   
   def format_file_list(updateable,uri)
@@ -73,7 +93,8 @@ class RSUtils
         name = @current[u].sub @path, ''
         name.sub! '\\' '/' if File::SEPARATOR == '\\'
         name = name[1..-1] if name[0] == '/'
-        file = {name: name, uploadfrom: 'disk', filename: @current[u]}
+        file = {name: name, uploadfrom: 'disk', filename: @current[u]} unless @current[u] =~ /^CHK@/
+        file = {name: @current[u].split('/')[-1], uploadfrom: 'redirect', targeturi: @current[u]} if @current[u] =~ /^CHK@/
         files.push file
       end
     end
@@ -85,6 +106,7 @@ class RSUtils
         ssk = uri.split '@'
         ssk = 'SSK@'+(ssk[1].split('/')[0...-1].join('/'))+"-#{@version}/"+name
         file = {name: name, uploadfrom: 'redirect', targeturi: ssk}
+        file = {name: @current[u].split('/')[-1], uploadfrom: 'redirect', targeturi: @current[u]} if @current[u] =~ /^CHK@/
         files.push file
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsite
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - hikiko