boxlet 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cad509b0ace0721f642bdbfa0a3642762eed408
-  data.tar.gz: 0f698f040646e23326774e6b71346b336a4d8232
+  metadata.gz: e2ec1c5b89c7db9e74e07a6b34f8d9ae898551fd
+  data.tar.gz: 235577cc755e9701464c44ac48b4da0b4415f4c2
 SHA512:
-  metadata.gz: 9efe8a0f63c60c1c8b82d06784225b5be520d18832aced1060397673adeae075c3a9377ba66408ce1a0b1105c4c656a3d8530424b41f3a67e4e80be84b97e7f0
-  data.tar.gz: 1b9c03604c0e9fd6b98ae4b70818a804f4c80a55b158d54f41d18ce299a6ccec30c81693caaab91cdca778a70b38776e2eb0252154e9f1504fdef7015da6b27e
+  metadata.gz: f16e15fb92292ce0d554fe4896b08486c94391b4305165295886ac1984553abf6bf2e473c35f10fd7a2591ee86429602fcbd37db6c68dfb919357785ccb8b477
+  data.tar.gz: aaa795ced180ab9961897faaa64bac91c3b2423fcac6a55a099544fd083dfa28f9b286c5877e42e5e769dd04e0dba8e21a1cbbd2a90ebe2f2fa9ae3af7a486b2

data/README.md

@@ -2,6 +2,8 @@
 
 Boxlet is a server + mobile app system that allows you to take advantage of free space on any cloud server you have ssh access to as a backup/sync for your photos.
 
+Boxlet is also compatible with storing files on Amazon S3.
+
 From the mobile iOS app, you can specify any server:port where the Boxlet server is running to sync and backup your photos to a remote server.
 
 

data/lib/boxlet/app.rb

@@ -72,11 +72,13 @@ module Boxlet
         end
 
         # Check for free space
-        if Boxlet::App.free_space <= 50
-          raise "Not enough free space"
-        end
-        if Boxlet::App.app_space_usage / Boxlet::App.app_space_capacity >= 0.9
-          puts "App is over 90% full"
+        if !Boxlet.config[:s3][:enabled]
+          if Boxlet::App.free_space <= 50
+            raise "Not enough free space"
+          end
+          if Boxlet::App.app_space_usage / Boxlet::App.app_space_capacity >= 0.9
+            puts "App is over 90% full"
+          end
         end
 
         puts "\nBoxlet setup is done!"
@@ -89,10 +91,12 @@ module Boxlet
     # App disk space functions
 
     def self.free_space
+      return -1 if Boxlet.config[:s3][:enabled]
       Boxlet::App.app_space_capacity - Boxlet::App.app_space_usage
     end
 
     def self.app_space_capacity
+      return -1 if Boxlet.config[:s3][:enabled]
       drive_free_space = Boxlet::App.drive_free_space
       if Boxlet.config[:capacity].is_a? String
         Boxlet::App.drive_free_space * Boxlet.config[:capacity].to_i / 100
@@ -103,6 +107,7 @@ module Boxlet
 
     def self.app_space_usage
       raise RuntimeError, "#{Boxlet.config[:upload_dir]} is not a directory" unless File.directory?(Boxlet.config[:upload_dir])
+      return -1 if Boxlet.config[:s3][:enabled]
 
       total_size = 0
       Dir["#{Boxlet.config[:upload_dir]}/**/*"].each do |f|

data/lib/boxlet/app/controller.rb

@@ -94,11 +94,9 @@ module Boxlet
 
       new_thumb_filename = "#{asset_path_params["id"]}-thumb.#{asset_path_params["ext"]}"
       new_thumb_path = File.join(upload_path, new_thumb_filename)
-      # FileUtils.cp(new_path, new_thumb_path)
 
       if File.exists? new_path
         file = File.open(new_path, 'r')
-        # asset_date = Date.parse(@params[:asset_date])
         asset = {
           filename: new_filename,
           size: file.size,

data/lib/boxlet/app/router.rb

@@ -23,13 +23,13 @@ module Boxlet
 
       response = Rack::Response.new
       controller = Boxlet::Controller.new(request)
-      if (@method == :* || request.get? && @method == :get) || (request.post? && @method == :post)
+      if @method == :* || (request.get? && @method == :get) || (request.post? && @method == :post)
         puts "Responding: #{@method.upcase} => #{@action}" if Boxlet.debug?
         action_response = controller.action(@action)
         response.status = 200
       else
         response.status = 404
-        action_response[:content] = "404 not found"
+        action_response = {format: :html, content: "404 not found"}
       end
 
       if action_response[:format] == :json

data/lib/boxlet/config.rb

@@ -58,6 +58,9 @@ module Boxlet
       :log_file => {
         :short      => 'L',
         :default    => Proc.new { Dir.pwd + "/server.log" }
+      },
+      :s3 => {
+        :default    => { enabled: false }
       }
     }
 

data/lib/boxlet/version.rb

@@ -1,3 +1,3 @@
 module Boxlet
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxlet
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - arktisklada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack