britebox 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0949a7ddc1540e0c8374818c3647930eb3560ded
-  data.tar.gz: 24c7939e3c0ca1e318ea9ff8af22c485649558b9
+  metadata.gz: 4b984224096de7c93471e4b5c00df2f83685ceb7
+  data.tar.gz: 6f8825ccc06078bd2d86a0e284b4086343c2bd27
 SHA512:
-  metadata.gz: c0a6695c78f1daed658d42c1826cb7ad5d43efdb9f3fe35bc7e371a6804e726f5c7d05a47f7a98722a897fd6c3a8efb028165367528d93aa0aa22d4a022d9f3f
-  data.tar.gz: b71b27e62b1877698515972d0afe8935edbfd262cac51c2087193fdcd83acfa271eac77ba93e7d6535a20f6ed09fcc46cb8b381c7002ac0e7c5e4158156ac2eb
+  metadata.gz: 7bcb3672dc53043bb600b140d8193ac065124a3c6f4cda7ee33d396015cc6ed60754543c1299b7c7cefa1787eba96a843004fd52cf9a7b743f5d5184ba314108
+  data.tar.gz: 9fcc5126c0c8728402f4dcbec8d14bb749febf1082728d099af763a0c18d6197c9fea5803ae1b42438db4a7a93e353eccd7b7d739da452b08c10fd2fff4e6a7a

data/bin/britebox

@@ -89,8 +89,13 @@ if command == 'watch'
       Britebox::Config.threads = v.to_i
     end
 
-    opts.on('--save', 'Save options to config file') do |v|
-      params[:save] = true
+
+    opts.on('-l', '--log [on/off]', 'Enable logging') do |v|
+      Britebox::Config.logging_enabled = !['off', 'false', '0'].include?(v.to_s.downcase)
+    end
+
+    opts.on('--log-file LOG_FILE', 'Path to operation log file') do |v|
+      Britebox::Config.log_file = v
     end
 
     opts.on('-p', '--port PORT', 'Set port number for web interface, ' +
@@ -110,6 +115,10 @@ if command == 'watch'
       Britebox::Config.simulate = !['off', 'false', '0'].include?(v.to_s.downcase)
     end
 
+    opts.on('--save', 'Save options to config file') do |v|
+      params[:save] = true
+    end
+
     common_opts(opts)
   end
 

data/lib/britebox/cli.rb

@@ -48,7 +48,9 @@ module Britebox
       puts "Output directory is #{@out_dir}"
 
       if Britebox::Config.simulate
-        EventLog.add 'WARN', "Running in simulation mode. No real requests to API will be made."
+        warn = "Running in simulation mode. No real requests to API will be made."
+        EventLog.add 'WARN', warn
+        puts warn
       end
 
       puts "Press Ctrl-C to quit"

data/lib/britebox/config.rb

@@ -7,19 +7,24 @@ module Britebox
     include Singleton
     include ActiveModel::Validations
 
-    OPTIONS = [:threads, :api_key, :watch_dir, :out_dir, :port, :ui_enabled, :simulate]
+    OPTIONS = [
+      :threads, :api_key, :watch_dir, :out_dir, :port, :ui_enabled, :simulate,
+      :logging_enabled, :log_file
+    ]
     OPTIONS.each { |o| attr_accessor(o) }
 
     MAX_THREADS = 10
 
-    validates_presence_of :threads, :api_key, :watch_dir, :out_dir, :port
+    validates_presence_of :threads, :api_key, :watch_dir, :out_dir, :port, :log_file
     validates_inclusion_of :port, in: 1..65535, message: ' should be in range 1..65535'
     validates_inclusion_of :threads, in: 1..MAX_THREADS, message: "should be in range 1..#{MAX_THREADS}"
     validate :watch_dir_present
 
     DEFAULT_OPTIONS = {
       threads: 10,
-      port: 7000
+      port: 7000,
+      logging_enabled: false,
+      log_file: '~/britebox.log'
     }
 
     CONFIG_PATH = '~/.britebox.json'

data/lib/britebox/event_log.rb

@@ -18,8 +18,7 @@ module Britebox
       event = OpenStruct.new(type: event_type, message: message, time: Time.now)
       self.instance.log_lines.push(event)
 
-      # if Britebox::Config.log ...
-      # save event to log
+      write_to_log(event)
 
       true
     end
@@ -28,6 +27,18 @@ module Britebox
       self.instance.log_lines.pop
     end
 
+    def self.write_to_log(event)
+      if Config.logging_enabled
+        begin
+          File.open(File.expand_path(Config.log_file), 'a+') do |f|
+            f.write "#{event.time.to_s} [#{event.type.to_s.upcase}] #{event.message}\n"
+          end
+        rescue Exception => ex
+          print "[ERROR] Can't save log: #{ex.message}\n"
+        end
+      end
+    end
+
     class << self
       alias_method :add, :push
     end

data/lib/britebox/file_job_pool.rb

@@ -75,7 +75,8 @@ module Britebox
 
     def print_event_log
       if (event = EventLog.pop)
-        puts "[#{event.type}] #{event.message}"
+        # disable printing events for now
+        # puts "[#{event.type}] #{event.message}"
       end
     end
 

data/lib/britebox/version.rb

@@ -1,3 +1,3 @@
 module Britebox
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/britebox/web_ui.rb

@@ -73,9 +73,13 @@ module Britebox
       data = JSON.parse request.body.read
 
       if Config.update(data)
+        EventLog.add 'web ui', "Settings updated"
+
         Config.values.to_json
       else
         status 422
+        EventLog.add 'web ui', "Some errors preventing settings from being saved: #{Config.errors.full_messages.join(', ')}"
+
         {errors: Config.errors.messages}.to_json
       end
     end

data/resources/assets/javascripts/compiled-coffee.js

@@ -118,6 +118,13 @@
           key: 'port',
           title: 'Port',
           help: 'Launch web server on this port'
+        }, {
+          key: 'logging_enabled',
+          title: 'Enable logging',
+          type: 'checkbox'
+        }, {
+          key: 'log_file',
+          title: 'Log file'
         }
       ];
       $scope.texts = {
@@ -138,23 +145,13 @@
         });
       };
       $scope.save = function(cb_ok, cb_error) {
-        var sett;
         if (cb_ok == null) {
           cb_ok = null;
         }
         if (cb_error == null) {
           cb_error = null;
         }
-        sett = {};
-        $('.settings-field input.form-control').each(function(k, elem) {
-          var value;
-          value = $(elem).val();
-          if ($scope.isNumber(value)) {
-            value = parseFloat(value);
-          }
-          return sett[$(elem).attr('name')] = value;
-        });
-        return $http.post('/settings', sett).success(function(data, status, headers, config) {
+        return $http.post('/settings', $scope.settings).success(function(data, status, headers, config) {
           $scope.errors = {};
           if (cb_ok) {
             cb_ok();
@@ -187,10 +184,19 @@
         return !$scope.errors[field];
       };
       $scope.formGroupClass = function(field) {
+        var k, type, _i, _len, _ref;
+        type = '';
+        _ref = $scope.modal_fields;
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          k = _ref[_i];
+          if (k.key === field && k.type === 'checkbox') {
+            type = 'checkbox ';
+          }
+        }
         if ($scope.isValidField(field)) {
-          return '';
+          return type;
         } else {
-          return 'has-error';
+          return type + 'has-error';
         }
       };
       $scope.isNumber = function(n) {

data/resources/assets/javascripts/controllers/settings_ctrl.coffee

@@ -8,6 +8,8 @@ app.controller 'SettingsCtrl', ['$scope', '$http', '$injector', ($scope, $http,
     {key: 'out_dir',  title: 'Output directory', help: 'Processed files will be placed here'}
     {key: 'threads',  title: 'Threads', help: 'Number of parallel threads used for processing, minimum is 1, maximum is 10'}
     {key: 'port',     title: 'Port', help: 'Launch web server on this port'}
+    {key: 'logging_enabled', title: 'Enable logging', type: 'checkbox'}
+    {key: 'log_file', title: 'Log file'}
   ]
 
   $scope.texts = {
@@ -28,13 +30,7 @@ app.controller 'SettingsCtrl', ['$scope', '$http', '$injector', ($scope, $http,
 
 
   $scope.save = (cb_ok = null, cb_error = null) ->
-    sett = {}
-    $('.settings-field input.form-control').each (k, elem) ->
-      value = $(elem).val()
-      value = parseFloat(value) if $scope.isNumber(value)
-      sett[$(elem).attr('name')] = value
-
-    $http.post('/settings', sett).success (data, status, headers, config) ->
+    $http.post('/settings', $scope.settings).success (data, status, headers, config) ->
       $scope.errors = {}
       cb_ok() if cb_ok
       $injector.get('$rootScope').$broadcast('settingsUpdated')
@@ -62,10 +58,14 @@ app.controller 'SettingsCtrl', ['$scope', '$http', '$injector', ($scope, $http,
     !$scope.errors[field]
 
   $scope.formGroupClass = (field) ->
+    type = ''
+    for k in $scope.modal_fields
+      if k.key == field && k.type == 'checkbox'
+        type = 'checkbox '
     if $scope.isValidField(field)
-      ''
+      type
     else
-      'has-error'
+      type + 'has-error'
 
   $scope.isNumber = (n) ->
     !isNaN(parseFloat(n)) && isFinite(n)

data/resources/public/javascripts/application.js

@@ -118,6 +118,13 @@
           key: 'port',
           title: 'Port',
           help: 'Launch web server on this port'
+        }, {
+          key: 'logging_enabled',
+          title: 'Enable logging',
+          type: 'checkbox'
+        }, {
+          key: 'log_file',
+          title: 'Log file'
         }
       ];
       $scope.texts = {
@@ -138,23 +145,13 @@
         });
       };
       $scope.save = function(cb_ok, cb_error) {
-        var sett;
         if (cb_ok == null) {
           cb_ok = null;
         }
         if (cb_error == null) {
           cb_error = null;
         }
-        sett = {};
-        $('.settings-field input.form-control').each(function(k, elem) {
-          var value;
-          value = $(elem).val();
-          if ($scope.isNumber(value)) {
-            value = parseFloat(value);
-          }
-          return sett[$(elem).attr('name')] = value;
-        });
-        return $http.post('/settings', sett).success(function(data, status, headers, config) {
+        return $http.post('/settings', $scope.settings).success(function(data, status, headers, config) {
           $scope.errors = {};
           if (cb_ok) {
             cb_ok();
@@ -187,10 +184,19 @@
         return !$scope.errors[field];
       };
       $scope.formGroupClass = function(field) {
+        var k, type, _i, _len, _ref;
+        type = '';
+        _ref = $scope.modal_fields;
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          k = _ref[_i];
+          if (k.key === field && k.type === 'checkbox') {
+            type = 'checkbox ';
+          }
+        }
         if ($scope.isValidField(field)) {
-          return '';
+          return type;
         } else {
-          return 'has-error';
+          return type + 'has-error';
         }
       };
       $scope.isNumber = function(n) {

data/resources/views/_settings_modal.erb

@@ -9,13 +9,23 @@
         <form>
 
           <div ng-repeat="opts in modal_fields" class="form-group settings-field {{formGroupClass(opts.key)}}">
-            <label for="settings-{{opts.key}}" class="control-label">{{opts.title}}</label>
+            <label for="settings-{{opts.key}}" class="control-label" ng-if="!opts.type">{{opts.title}}</label>
             <input type="text"
                    class="form-control"
                    id="settings-{{opts.key}}"
                    placeholder=""
                    name="{{opts.key}}"
+                   ng-if="!opts.type"
                    ng-model="settings[opts.key]">
+
+            <label ng-if="opts.type == 'checkbox'">
+              <input type="checkbox"
+                     id="settings-{{opts.key}}"
+                     name="{{opts.key}}"
+                     ng-model="settings[opts.key]">
+              {{opts.title}}
+            </label>
+
             <p class="help-block" ng-if="opts.help && isValidField(opts.key)">{{opts.help}}</p>
             <p class="help-block" ng-if="!isValidField(opts.key)">{{opts.title}} {{errors[opts.key]}}</p>
           </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: britebox
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Alexander Shapiotko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brite-api