reedb 0.10.rc1 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11820940b0e80cda5ea4e0ab59fb2dd4b5a06189
-  data.tar.gz: f6ed0c7e514bfebb4b25750e7583dbb2fdc2c0c9
+  metadata.gz: 7c1963fd6fa73990571af644539840c3be811404
+  data.tar.gz: 3683b3a01c65b2f5afeccd4b3439700281ea1ad0
 SHA512:
-  metadata.gz: 1c960ebf6cf718de201067246c8eb13fecd43c40f23482d2e6d594ae5229ed42ec2fc2f3642ef4c26f89d8d26401d570d31bbc1388fc8138395f0b4c044a7d7f
-  data.tar.gz: 2f0ecd887ad56e8bc3a04c84b2a8e5bf97ba37d4cb69980a573e19d5c33c595867a58c3146a1d61b81fd61f624a208cb851956ad08d3072bbb3cb6cee8628f31
+  metadata.gz: 27ce1d42d5be4b0c9f5dece31791e0ba75a29419a20cb44d6255529c775c42614ebab2482e45b046dd1d50db641baec127e0e161a6d5d8660c63fc25298f6500
+  data.tar.gz: c93e234433ec38740f6f45c5d0519331bb9b6d238ea3bbee1dcafc25e0b09fa1884d5c69afedc19092d38a6a1cc9215cf4b20d0ff9c9b39ff71afc7e49dde9c4

data/Gemfile

@@ -1,15 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in reedb.gemspec
-gemspec
-
-# Security!
-gem 'aes', '>=0.5.0'
-gem 'twofish', '>=1.0.5'
-gem 'digest-tiger', '~> 1.0.2'
-
-# Other stuff that's important
-gem 'json', '~> 1.8.2'
-gem 'daemons', '~> 1.2.2'
-gem 'sinatra', '~> 1.4.6'
-gem 'hashids', '~> 1.0.2'
+gemspec

data/Gemfile.lock

@@ -1,7 +1,14 @@
 PATH
   remote: .
   specs:
-    reedb (0.9.9.pre.RC1)
+    reedb (0.10.8)
+      aes (~> 0.5)
+      daemons (~> 1.2)
+      digest-tiger (~> 1.0)
+      json (~> 1.8)
+      sinatra (~> 1.4)
+      twofish (~> 1.0)
+      uuid (~> 2.3)
 
 GEM
   remote: https://rubygems.org/
@@ -9,9 +16,10 @@ GEM
     aes (0.5.0)
     daemons (1.2.2)
     digest-tiger (1.0.2)
-    hashids (1.0.2)
-    json (1.8.2)
-    rack (1.6.1)
+    json (1.8.3)
+    macaddr (1.7.1)
+      systemu (~> 2.6.2)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
     rake (10.4.2)
@@ -19,20 +27,18 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
+    systemu (2.6.5)
     tilt (2.0.1)
     twofish (1.0.5)
+    uuid (2.3.8)
+      macaddr (~> 1.0)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aes (>= 0.5.0)
   bundler (~> 1.7)
-  daemons (~> 1.2.2)
-  digest-tiger (~> 1.0.2)
-  hashids (~> 1.0.2)
-  json (~> 1.8.2)
   rake (~> 10.0)
   reedb!
-  sinatra (~> 1.4.6)
-  twofish (>= 1.0.5)
+  yard (~> 0.8)

data/bin/reedbd

@@ -9,54 +9,96 @@
 # 	https://www.gnu.org/licenses/lgpl.html)
 # ====================================================
 
+#  Checks the ruby version for ruby 2.1! This is the only supported version so far and if you run as something else
+# then guess what: I ain't gonna care when it breaks, bitch! :)
+# (Okay, that was unneccesarily ghetto. Sorry.)
+#
+rv = RUBY_VERSION
+unless rv[0..-3] == '2.1'
+	puts 'You are running Reedb with an unsupported Ruby version! Officially only 2.1.* is supported!'
+	puts 'Do you want to take the risk and run Reedb anyways? [y/N] '
+	a = gets.chomp.to_s.upcase
+	if a == 'N' || a == ''
+		exit(0x8)
+	else
+		puts "Don't complain..."
+		sleep(0.25)
+		puts ''
+	end
+end
 
-# Very simple wrapper script to start the Reedb daemon.
-require 'reedb/constants'
+# Only loads the constants section to read the version.
+spec = nil
+begin
+	spec = Gem::Specification.find_by_name('reedb')
+	require 'reedb/constants'
+rescue Gem::LoadError => e
+	begin
+		require_relative '../lib/reedb/constants'
+	rescue
+		puts 'Error: reedb not installed!'
+		exit(0x21)
+	end
+end
 
-NAME = 'reedbd'
+W_NAME = 'reedbd'
+C_NAME = 'reedb'
 
-if File.basename(__FILE__) == NAME
+# Very simple wrapper script to start the Reedb daemon.
+if File.basename(__FILE__) == W_NAME
 	if ARGV.include? '--version'
 		puts Reedb::VERSION
-		exit
+		exit(0)
 	end
 
 	if ARGV == []
-		puts "[ERROR]: Invalid application arguments!"
-		puts "Usage: reedb [daemon options] -- [reedb options]
+		puts '[ERROR]: Invalid application arguments!'
+		puts "Usage: reedb (daemon options) [-- reedb options]
 
   Available [reedb options]:
      -l, --pw-length INTEGER     Define minimal passphrase length (Default: 12)
-     -p, --port INTEGER          Change the listener port. May break your setup!
-     -a, --app-path STRING      Change the path for the reedb config files/ logs. (default in ~)
+     -p, --port INTEGER          Change the listener port. May break your setup! (default: #{Reedb::NET_PORT})
+     -a, --app-path STRING      Change the path for the reedb config files/ logs. (default: ~)
      -v, --verbose               Enable verbose logging about the Reedb daemon.
      -d, --no-daemon             Don't run Reedb as a background daemon. Log to STOUT instead of log file.
+		 -f, --force               Force Reedb to start a new instance in case an old one was locked. (Dangerous!)
 
   Available [daemon options]:
-     start                       Start an instance of the #{NAME} daemon
-     stop                        Stop all instances of the #{NAME} daemon
-     restart                     Stop all and restart a new instance of #{NAME} afterwards
-     status                      Show status (PID) of #{NAME} daemon instance
+     start                       Start an instance of the #{C_NAME} daemon
+     stop                        Stop all instances of the #{C_NAME} daemon
+     restart                     Stop all and restart a new instance of #{C_NAME} afterwards
+     status                      Show status (PID) of #{C_NAME} daemon instance
 
   Common options:
-         --version               Show #{NAME} version"
+         --version               Show #{C_NAME} version"
 
 		# Then exits the application
 		exit
 	end
 
 	options = {
-		:app_name   => "reedb",
-		:backtrace  => true,
-		# :monitor    => true,
-		# :ontop      => true
+		 :app_name => 'reedb',
+		 :backtrace => true
 	}
 
-	spec = Gem::Specification.find_by_name("reedb")
-	(puts "Error: reedb not installed!" ; exit) unless spec
-	path = (spec.gem_dir) + "/lib/reedb"
+	if spec
+		g_path = (spec.gem_dir) + '/lib/reedb'
+		require 'reedb'
+
+	# 	puts "Reedb isn't properly installed on your system!
+ # Please make sure Gems can load it before trying to run this daemon again!
+ # Exit code: #{0x9}"
+ #
+ # 		exit(0x9)
+	else
+		g_path = '../lib/reedb/'
+		require_relative '../lib/reedb'
+	end
 
+
+	# NOW load the required modules to run.
 	require 'daemons'
-	require 'reedb'
-	Daemons.run(File.join(path, 'daemon_wrapper.rb'), options)
+
+	# Then actually start the wrapper.
+	Daemons.run(File.join(g_path, 'daemon_wrapper.rb'), options)
 end

data/lib/reedb/constants.rb

@@ -1,6 +1,6 @@
 # ====================================================
 # Copyright 2015 Lonely Robot (see @author)
-# @author: Katharina Sabel | www.2rsoftworks.de
+# @author: Katharina Sabel | www.lonelyrobot.io
 #
 # Distributed under the GNU Lesser GPL Version 3
 # (See accompanying LICENSE file or get a copy at
@@ -13,30 +13,18 @@ module Reedb
 	# The version of reedb. This is actually written into vaults to identify
 	# breaking changes and using an older sub-set of the API to interact with
 	# legacy vaults.
-	VERSION = "0.10.rc1"
+	VERSION = '0.11'
 	NET_PORT = 55736
-	TOKEN_BYTE_SIZE = 16 # in bytes
-	DEF_MASTER_PATH = "__sysmas__" # Placeholder
+	TOKEN_BYTE_SIZE = 8 # in bytes
+	DEFAULT_PATH = '__sysmas__' # Placeholder
 	FILE_CACHE_TIME = 2500 # Time in ms
- 	KEY_CACHE_TIME = (15 * 60) * 1000 # (30 minutes in ms)
 
+	# Debounce constants
+	DEBOUNCE_DELTA = 2.5 # 2500 ms
+	KEY_CACHE_TIME = (15 * 60) # (15 minutes in seconds)
+	THREAD_TIMEOUT_TIME = DEBOUNCE_DELTA * 1.0125
 
-
- 	#
- 	# THIS SECTION WILL BE RESERVED FOR ERROR CODES AS RETURN VALUES
- 	#
- 	FILE_MALFORMED_DATA_ERROR = 0x11
-
- 	#
- 	# VAULT ERROR CODES
- 	#
- 	VAULT_FILE_NOT_FOUND_ERROR = 0x12
-
-
- 	#
- 	# RETURN ERROR CODES
- 	#
- 	DAEMON_UNKNOWN_TOKEN_ERROR = 0x31
- 	DAEMON_UNAUTHORISED_TOKEN_ERROR = 0x32
- 	DAEMON_INACTIVE_VAULT_ERROR = 0x33
+	# Debouncer markers
+	DEB_ADD = :add
+	DEB_REM = :remove
 end