boxlet 0.0.3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6d7e5f493bed4061382d3948eeefd5e8c05c69a
-  data.tar.gz: 1110db140ef82acce692bf102e0813dde7213060
+  metadata.gz: a8ccc8e3e2d33bcd02ae4ad95387f2f7b356dcbb
+  data.tar.gz: baefad60c68d00b903da3a60a17035297d2424ed
 SHA512:
-  metadata.gz: 7a1086d5b524547e517f5b99454c3d9a035754c3c2bd131860f466675ecb8bfda12190f415361ecd0c39e90c111ceb15dc15b71ba957eb5ed52f473e907a4dd8
-  data.tar.gz: 4116a07c56b25aab3848b5deddbe6d1ece5af309053ea84ea4cb034d2a99b610db822bfc294b17ad839aed353010ac3354d80195500517192f02dfb176b27850
+  metadata.gz: d633624ee6ebcf811baa9e274827949e81f2d6a6c6b038977c8e54be1c44c735715a1037ce3faa845121dbda76b7fff5e63f775caff684cc1b8eed0a892dfe50
+  data.tar.gz: 442348771e3e1266b458884165e5f6a6ef388ad1e48cb93f073fb6fc1418782496078eb916325748ad6a757e2f2021fe397c0e5a1fa693a2a143d7bc53cb4928

data/README.md

@@ -1,6 +1,6 @@
 # Boxlet
 
-Boxlet is a server + mobile app system that allows you to take advantage of free space on any cloud server you may have ssh access to.
+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.
 
 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/config.yml

@@ -2,7 +2,7 @@
 
 # Environment
 environment: development
-debug: true
+debug: false
 
 # File system parameters
 # path: ./
@@ -18,6 +18,8 @@ port: 8077
 host: localhost
 server_type: thin
 daemonize: false
+pid_file: server.pid
+log_file: server.log
 
 # Database config
 db:

data/lib/boxlet.rb

@@ -19,7 +19,6 @@ module Boxlet
 
   def run!(argv, command='run', config_file='config.yml', &blk)
     populate_params!(argv, config_file)
-    
     app = Boxlet::App.new
 
     case command

data/lib/boxlet/app.rb

@@ -34,15 +34,17 @@ module Boxlet
     def bind
       Rack::Builder.new do
         use Rack::Reloader
-        # use Rack::Static, :urls => ["/public"]
-        use Rack::FileUpload, :upload_dir => [Boxlet.config[:upload_dir] || APP_ROOT + '/uploads']
+        use Rack::FileUpload, :upload_dir => [Boxlet.config[:upload_dir] || APP_ROOT + "/uploads"]
+        use Rack::Static, :urls => ["/uploads"]
 
+        # map "/uploads" do
+        #   run Rack::File.new(Boxlet.config[:upload_dir])
+        # end
         Boxlet::App.routes.each do |route, action|
           map route[0] do
             run Boxlet::Router.new(route[1] || :*, action)
           end
         end
-
       end.to_app
     end
 

data/lib/boxlet/app/controller.rb

@@ -1,4 +1,5 @@
 require 'date'
+require 'digest'
 
 # routes = {
 #   ["/", :get]                 => :index,
@@ -92,7 +93,7 @@ module Boxlet
         file = File.open(new_path, 'r')
         # asset_date = Date.parse(@params[:asset_date])
         asset = {
-          filename: upload_file[:filename],
+          filename: new_filename,
           size: file.size,
           local_date: file.mtime.to_i,
           asset_path: @params[:asset_path],
@@ -133,9 +134,24 @@ module Boxlet
     end
 
     def user_upload_dir
-      user_upload_dir_name = Boxlet.config[:upload_dir] + "/" + (@params[:uuid] || '')
+      dir_name = @params[:uuid] || ''
+      user_upload_dir_name = Boxlet.config[:upload_dir] + "/" + dir_name
       Dir.mkdir(user_upload_dir_name) unless File.exists?(user_upload_dir_name)
-      user_upload_dir_name
+
+      if @params[:uuid]
+        dir_shortname = Digest::MD5.hexdigest(dir_name)
+        user_upload_dir_shortname = Boxlet.config[:upload_dir] + "/" + dir_shortname
+
+        File.symlink(dir_name, user_upload_dir_shortname) if !File.symlink? user_upload_dir_shortname
+
+        if File.symlink? user_upload_dir_shortname
+          user_upload_dir_shortname
+        else
+          user_upload_dir_name
+        end
+      else
+        user_upload_dir_name
+      end
     end
 
     def free_space?

data/lib/boxlet/config.rb

@@ -2,6 +2,10 @@ module Boxlet
   module Config
 
     ARGS  = {
+      :environment => {
+        :short      => 'E',
+        :default    => 'development'
+      },
       :path => {
         :short      => 'f',
         :default    => Proc.new { Dir.pwd }
@@ -20,19 +24,15 @@ module Boxlet
         :default    => 'rack',
         :sanitizer  => Proc.new { |p| p.to_sym }
       },
-      :environment => {
-        :short      => 'E',
-        :default    => 'development'
-      },
       :daemonize => {
-        :short      => 'D',
+        :short      => 'd',
         :default    => 'false',
-        :sanitizer  => Proc.new { |p| p == 'true' }
+        :sanitizer  => Proc.new { |p| p == true || p == 'true' }
       },
       :debug => {
-        :short      => 'd',
+        :short      => 'D',
         :default    => 'true',
-        :sanitizer  => Proc.new { |p| p == 'true' }
+        :sanitizer  => Proc.new { |p| p == true ||  p == 'true' }
       },
       :upload_dir => {
         :short      => 'U',
@@ -50,6 +50,14 @@ module Boxlet
         :short      => 'C',
         :default    => '90%',
         :sanitizer  => Proc.new { |p| (p.to_i.to_s == p) ? p.to_i : p }
+      },
+      :pid_file => {
+        :short      => 'P',
+        :default    => Proc.new { Dir.pwd + "/server.pid" }
+      },
+      :log_file => {
+        :short      => 'L',
+        :default    => Proc.new { Dir.pwd + "/server.log" }
       }
     }
 
@@ -57,8 +65,8 @@ module Boxlet
     def populate_params!(argv, path_to_config)
       @raw_config = load_config_file(path_to_config)
       @raw_params = parse_arguments(argv)
-      # @config = @raw_params.merge(@raw_config)
-      @config = @raw_config.merge(@raw_params)
+
+      @config = @raw_params
 
       @config[:debug] = @raw_config[:debug] || @raw_params[:debug]
       if @config[:debug]
@@ -80,7 +88,8 @@ module Boxlet
     private
 
     def parse_arguments(argv)
-      params = Hash.new
+      # params = Hash.new
+      params = @raw_config
 
       ARGS.each_pair do |param_name, param_attrs|
         param_short_name = param_attrs[:short]

data/lib/boxlet/version.rb

@@ -1,3 +1,3 @@
 module Boxlet
-  VERSION = "0.0.3"
+  VERSION = "0.1.1"
 end

data/lib/handlers/thin.rb

@@ -20,13 +20,19 @@ module Boxlet
         # default_host = environment == 'development' ?  : '0.0.0.0'
         host = @params.delete(:Host) || 'localhost'
         port = @params.delete(:Port) || 8077
-
+# pp @params
         args = [host, port, @app, @params]
 
         # Thin versions below 0.8.0 do not support additional options
         args.pop if ::Thin::VERSION::MAJOR < 1 && ::Thin::VERSION::MINOR < 8
         server = ::Thin::Server.new(*args)
         yield server if block_given?
+
+        if @params[:daemonize] == true
+          server.pid_file = @params[:pid_file]
+          server.log_file = @params[:log_file]
+          server.daemonize
+        end
         server.start
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxlet
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.1
 platform: ruby
 authors:
 - arktisklada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack