boxlet 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 747a9a9bfd1d9d2e35526a2598de8068da0b6b50
-  data.tar.gz: 216e7a7e1e347af798051937e49f5ce1346d900c
+  metadata.gz: 956d2071a94833442316b9e97b35eaaf40284976
+  data.tar.gz: a6997a8a7258f156543cddc80eff0b6527d740b3
 SHA512:
-  metadata.gz: 662a886c81d25f08002955fee77fe75d505b5cb87481b21477f804c9774f0b8458a8ca9c5326a311a25c3033b0e75e61e0f7e2a25e104db03dd65804cebc01a2
-  data.tar.gz: c2ba14e886be4d2661de8655bbf2869ea45586b808a5eeddcf095c5a9d8e6131ab0c39dbca2a077006bdeb75c91b7cae5c8698fd14d4ecc781b2b80d521c6412
+  metadata.gz: b2162347f5df7546e58b33372afe319fca9360d46551a8bcdc1e549f47961be04fc207c0b4404f899d04e316415f7749e81d1f0902db5d939989c276f646b55f
+  data.tar.gz: a550939df3ccbd8588f7a9a62af995f36aa3d6a9fc941b2066a7c9491d03a9665ac81e58a41c598f2137011eadc52b0e522df553603baeb806c93b5455b9aeb0

data/README.md

@@ -22,7 +22,7 @@ From the mobile iOS app, you can specify any server:port where the Boxlet server
 
 ## Usage
 
-Run `boxlet` from any folder to stat the server with default settings.
+Run `boxlet run` from any folder to stat the server with default settings.
 
 See below for config and parameters.
 
@@ -104,8 +104,7 @@ Many config options are available as command-line parameters
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+1. Fork this repo
+2. Create an [issue/feature request](https://github.com/arktisklada/boxlet/issues)
+3. Create, commit, and push your feature branch (my-new-feature)
+4. Create new Pull Request

data/lib/boxlet.rb

@@ -6,12 +6,9 @@ require 'boxlet/log'
 require 'boxlet/config'
 require 'boxlet/runner'
 
-
 APP_ROOT = Dir.pwd
 
-
 module Boxlet
-
   extend self
   extend Boxlet::Config
 
@@ -22,13 +19,24 @@ module Boxlet
     @log = Boxlet::Log.new(@config[:log_file], (debug? ? Logger::DEBUG : Logger::INFO))
     @app = Boxlet::App.new
 
+    command = command.to_s.to_sym
     case command
-      when 'run'
-        Boxlet.log(:debug, @config)
-        @runner = Boxlet::Runner.new
-        @runner.start(@app.bind, &blk)
-      else
+    when :run
+      Boxlet.log(:debug, @config)
+      @runner = Boxlet::Runner.new
+      @runner.start(@app.bind, &blk)
+    when :stop
+      if @config[:daemonize] == true
+        pid = File.read(@config[:pid_file]).to_i
+        puts "Killing #{pid}..."
+        Process.kill(Signal.list["TERM"], pid)
+      end
+    else
+      if App::PUBLIC_COMMANDS.keys.include?(command)
         @app.send(command, argv)
+      else
+        print_menu
+      end
     end
 
     @app
@@ -39,22 +47,36 @@ module Boxlet
     @app
   end
 
-
   def debug?
     @config[:debug] == true
   end
+
   def config
     @config
   end
+
   def params
     @params
   end
+
   def log(level, message)
     @log.write(level, message)
   end
 
-end
+  private
 
+    def print_menu
+      puts "Usage: boxlet command [args]"
+      puts
+      puts "Available commands are as follows:"
+      commands_with_descriptions = App::PUBLIC_COMMANDS.merge run: "Run the Boxlet server"
+      commands = commands_with_descriptions.keys
+      max_chars = commands.sort { |a, b| a.length <=> b.length }.last.length
+      commands.sort.each do |command|
+        puts " #{command.to_s.ljust(max_chars)}   #{commands_with_descriptions[command]}"
+      end
+    end
+end
 
 # Configure our temporary folder
 class Dir  
@@ -72,4 +94,4 @@ class Dir
       File.expand_path(tmp)
     end
   end
-end
+end

data/lib/boxlet/app.rb

@@ -10,9 +10,14 @@ require 'boxlet/app/models'
 
 module Boxlet
   class App
-
     include Sys
 
+    PUBLIC_COMMANDS = {
+      add_user: "Add a new user to the database",
+      change_password: "Change a user's password",
+      setup: "Initialize a directory as a Boxlet app (create folders, check space, etc.)."
+    }.freeze
+
     def self.routes
       routes = {
         # ["/", :get]                 => :index,
@@ -47,7 +52,6 @@ module Boxlet
       end.to_app
     end
 
-
     def setup(args)
       begin
         Boxlet.log(:debug, Boxlet.config)
@@ -88,7 +92,6 @@ module Boxlet
       end
     end
 
-
     def add_user(args)
       unless username = args['-u']
         raise 'You must specify a username with -u'
@@ -135,6 +138,5 @@ module Boxlet
     rescue Exception => e
       Boxlet.log(:fatal, "ERROR: #{e}")
     end
-
   end
-end
+end

data/lib/boxlet/app/controller.rb

@@ -36,9 +36,7 @@ module Boxlet
       {format: @format, content: action_response}
     end
 
-
     # actions
-
     def index
       '<html><body><form action="/push_files" method="post" enctype="multipart/form-data">UUID:<input type="text" name="uuid"><br><input type="file" name="file"><input type="submit"></form>'
     end
@@ -103,6 +101,7 @@ module Boxlet
           filename: new_filename,
           size: file.size,
           local_date: file.mtime.to_i,
+          orientation: @params[:orientation],
           thumbnail: new_thumb_filename,
           asset_path: @params[:asset_path],
           asset_date: @params[:asset_date],
@@ -225,4 +224,4 @@ module Boxlet
         end
       end
   end
-end
+end

data/lib/boxlet/app/models.rb

@@ -21,6 +21,5 @@ module Boxlet
         last_activity: Time.now
       }
     end
-
   end
-end
+end

data/lib/boxlet/app/router.rb

@@ -6,7 +6,6 @@ require 'json'
 
 module Boxlet
   class Router
-
     attr_accessor :method, :action
 
     def initialize(method, action)
@@ -38,6 +37,5 @@ module Boxlet
 
       response.finish
     end
-
   end
-end
+end

data/lib/boxlet/config.rb

@@ -64,7 +64,6 @@ module Boxlet
       }
     }
 
-
     def populate_params!(argv, path_to_config)
       @raw_config = load_config_file(path_to_config)
       @raw_params = parse_arguments(argv)
@@ -73,7 +72,6 @@ module Boxlet
       @config[:debug] = @raw_config[:debug] || @raw_params[:debug]
     end
 
-
     def symbolize_keys(hash)
       hash.inject({}){|result, (key, value)|
         new_key = key.instance_of?(String) ? key.to_sym : key
@@ -84,7 +82,6 @@ module Boxlet
       }
     end
 
-
     private
 
       def parse_arguments(argv)
@@ -121,4 +118,4 @@ module Boxlet
         end
       end
     end
-end
+end

data/lib/boxlet/db.rb

@@ -3,7 +3,6 @@ require 'mongo'
 
 module Boxlet
   module Db
-
     extend self
     include Mongo
 
@@ -24,6 +23,5 @@ module Boxlet
       db = client.db(db_config[:db] || 'boxlet_development')
       return db
     end
-
   end
-end
+end

data/lib/boxlet/runner.rb

@@ -32,6 +32,5 @@ module Boxlet
     def thin(app, params)
       Boxlet::Handlers::Thin.new(app, params)
     end
-
   end
-end
+end

data/lib/boxlet/util.rb

@@ -5,13 +5,11 @@ module Boxlet
     include Sys
 
     # Auth methods
-
     def self.encrypt(string)
       (Digest::SHA256.new << string).to_s
     end
 
     # App disk space functions
-
     def self.free_space
       return -1 if Boxlet.config[:s3][:enabled]
       Boxlet::Util.app_space_capacity - Boxlet::Util.app_space_usage
@@ -41,7 +39,6 @@ module Boxlet
     end
 
     # Drive disk space functions
-
     def self.drive_free_space
       stat = Filesystem.stat(Boxlet.config[:file_system_root])
       (stat.block_size * stat.blocks_available).to_mb
@@ -51,6 +48,5 @@ module Boxlet
       stat = Filesystem.stat(Boxlet.config[:file_system_root])
       (stat.block_size * stat.blocks).to_mb
     end
-
   end
-end
+end

data/lib/boxlet/version.rb

@@ -1,3 +1,3 @@
 module Boxlet
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/handlers/thin.rb

@@ -36,4 +36,4 @@ module Boxlet
       end
     end
   end
-end
+end

data/lib/rack/boxlet_url_builder.rb

@@ -7,10 +7,10 @@ module Rack
 
     private
 
-    def generate_map(default_app, mapping)
-      mapped = default_app ? {'/' => default_app} : {}
-      mapping.each { |r,b| mapped[r] = self.class.new(default_app, &b) }
-      BoxletUrlMap.new(mapped)
-    end
+      def generate_map(default_app, mapping)
+        mapped = default_app ? {'/' => default_app} : {}
+        mapping.each { |r,b| mapped[r] = self.class.new(default_app, &b) }
+        BoxletUrlMap.new(mapped)
+      end
   end
-end
+end

data/lib/rack/boxlet_url_map.rb

@@ -56,11 +56,9 @@ module Rack
       end
 
       [404, {"Content-Type" => "text/plain", "X-Cascade" => "pass"}, ["Not Found: #{path}"]]
-
     ensure
       env['PATH_INFO'] = path
       env['SCRIPT_NAME'] = script_name
     end
-
   end
 end

data/lib/rack/file_upload.rb

@@ -25,97 +25,97 @@ module Rack
       end
     end
 
-
     private
 
-    def convert_and_pass_on(env)
-      if env['rack.input'].kind_of?(Tempfile)
-        env['rack.input'].extend(EqlFix)
-        tempfile = env['rack.input']
-      else
-        tempfile = Tempfile.new('raw-upload.', @tmpdir)
-
-        env['rack.input'].each do |chunk|
-          if chunk.respond_to?(:force_encoding)
-            tempfile << chunk.force_encoding('UTF-8')
-          else
-            tempfile << chunk
+      def convert_and_pass_on(env)
+        if env['rack.input'].kind_of?(Tempfile)
+          env['rack.input'].extend(EqlFix)
+          tempfile = env['rack.input']
+        else
+          tempfile = Tempfile.new('raw-upload.', @tmpdir)
+
+          env['rack.input'].each do |chunk|
+            if chunk.respond_to?(:force_encoding)
+              tempfile << chunk.force_encoding('UTF-8')
+            else
+              tempfile << chunk
+            end
           end
+          env['rack.input'].rewind
+
+          tempfile.flush
+          tempfile.rewind
         end
-        env['rack.input'].rewind
 
-        tempfile.flush
-        tempfile.rewind
-      end
-      fake_file = {
-        :filename => env['HTTP_X_FILE_NAME'],
-        :type => env['CONTENT_TYPE'],
-        :tempfile => tempfile,
-      }
-      env['rack.request.form_input'] = env['rack.input']
-      env['rack.request.form_hash'] ||= {}
-      env['rack.request.query_hash'] ||= {}
-      env['rack.request.form_hash']['file'] = fake_file
-      env['rack.request.query_hash']['file'] = fake_file
-      if env['HTTP_X_QUERY_PARAMS']
-        env['rack.errors'].puts("Warning! The header X-Query-Params is deprecated. Please use X-JSON-Params instead.")
-        inject_json_params!(env, env['HTTP_X_QUERY_PARAMS'])
-      end
-      if env['HTTP_X_JSON_PARAMS']
-        inject_json_params!(env, env['HTTP_X_JSON_PARAMS'])
-      end
-      if env['HTTP_X_PARAMS']
-        inject_query_params!(env, env['HTTP_X_PARAMS'])
+        fake_file = {
+          :filename => env['HTTP_X_FILE_NAME'],
+          :type => env['CONTENT_TYPE'],
+          :tempfile => tempfile,
+        }
+        env['rack.request.form_input'] = env['rack.input']
+        env['rack.request.form_hash'] ||= {}
+        env['rack.request.query_hash'] ||= {}
+        env['rack.request.form_hash']['file'] = fake_file
+        env['rack.request.query_hash']['file'] = fake_file
+        if env['HTTP_X_QUERY_PARAMS']
+          env['rack.errors'].puts("Warning! The header X-Query-Params is deprecated. Please use X-JSON-Params instead.")
+          inject_json_params!(env, env['HTTP_X_QUERY_PARAMS'])
+        end
+        if env['HTTP_X_JSON_PARAMS']
+          inject_json_params!(env, env['HTTP_X_JSON_PARAMS'])
+        end
+        if env['HTTP_X_PARAMS']
+          inject_query_params!(env, env['HTTP_X_PARAMS'])
+        end
+        @app.call(env)
       end
-      @app.call(env)
-    end
 
-    def kick_in?(env)
-      env['HTTP_X_FILE_UPLOAD'] == 'true' ||
-        ! @explicit && env['HTTP_X_FILE_UPLOAD'] != 'false' && raw_file_upload?(env) ||
-        env.has_key?('HTTP_X_FILE_UPLOAD') && env['HTTP_X_FILE_UPLOAD'] != 'false' && raw_file_upload?(env)
-    end
+      def kick_in?(env)
+        env['HTTP_X_FILE_UPLOAD'] == 'true' ||
+          ! @explicit && env['HTTP_X_FILE_UPLOAD'] != 'false' && raw_file_upload?(env) ||
+          env.has_key?('HTTP_X_FILE_UPLOAD') && env['HTTP_X_FILE_UPLOAD'] != 'false' && raw_file_upload?(env)
+      end
 
-    def raw_file_upload?(env)
-      upload_path?(env['PATH_INFO']) &&
-        %{POST PUT}.include?(env['REQUEST_METHOD']) &&
-        content_type_of_raw_file?(env['CONTENT_TYPE']) &&
-        env['CONTENT_LENGTH'].to_i > 0
-    end
+      def raw_file_upload?(env)
+        upload_path?(env['PATH_INFO']) &&
+          %{POST PUT}.include?(env['REQUEST_METHOD']) &&
+          content_type_of_raw_file?(env['CONTENT_TYPE']) &&
+          env['CONTENT_LENGTH'].to_i > 0
+      end
 
-    def literal_path_match?(request_path, candidate)
-      candidate == request_path
-    end
+      def literal_path_match?(request_path, candidate)
+        candidate == request_path
+      end
 
-    def wildcard_path_match?(request_path, candidate)
-      return false unless candidate.include?('*')
-      regexp = '^' + candidate.gsub('.', '\.').gsub('*', '[^/]*') + '$'
-      !! (Regexp.new(regexp) =~ request_path)
-    end
+      def wildcard_path_match?(request_path, candidate)
+        return false unless candidate.include?('*')
+        regexp = '^' + candidate.gsub('.', '\.').gsub('*', '[^/]*') + '$'
+        !! (Regexp.new(regexp) =~ request_path)
+      end
 
-    def content_type_of_raw_file?(content_type)
-      case content_type
-        when %r{^application/x-www-form-urlencoded}, %r{^multipart/form-data}
-          false
-        else
-          true
+      def content_type_of_raw_file?(content_type)
+        case content_type
+          when %r{^application/x-www-form-urlencoded}, %r{^multipart/form-data}
+            false
+          else
+            true
+        end
       end
-    end
 
-    def random_string
-      (0...8).map{65.+(rand(25)).chr}.join
-    end
+      def random_string
+        (0...8).map{65.+(rand(25)).chr}.join
+      end
 
-    def inject_json_params!(env, params)
-      json = MultiJson.load(params)
-      env['rack.request.form_hash'].merge!(json)
-      env['rack.request.query_hash'].merge!(json)
-    end
+      def inject_json_params!(env, params)
+        json = MultiJson.load(params)
+        env['rack.request.form_hash'].merge!(json)
+        env['rack.request.query_hash'].merge!(json)
+      end
 
-    def inject_query_params!(env, params)
-      json = Rack::Utils.parse_query(params)
-      env['rack.request.form_hash'].merge!(json)
-      env['rack.request.query_hash'].merge!(json)
+      def inject_query_params!(env, params)
+        json = Rack::Utils.parse_query(params)
+        env['rack.request.form_hash'].merge!(json)
+        env['rack.request.query_hash'].merge!(json)
+      end
     end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxlet
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - arktisklada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -237,8 +237,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Upload pics from your phone
 test_files: []
+has_rdoc: