relaxo 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9be2c95aada8b0d15d79f7376b32e57a07724cbe1fd93afa578091c0c522906c
-  data.tar.gz: b17fa3492dd504ba16a018fee637e8c1d3d293bdacc4fb84f65e5deefca3e792
+  metadata.gz: b71fd8263f890a77bf20e18e6e3258edeee8954076452914cb35698a7827723b
+  data.tar.gz: e502abf00e610646d5866868b23c931330b919ab5e3ab280128f82d070765c11
 SHA512:
-  metadata.gz: d0b4a7b024ad81169340891f1c7541bc2b5a1ecff678c4f4685b1aa8c7567546f6d0f7a69c078b132f6e9a88b90ea1d63ea14308c7984836850ac0ae1fe979d2
-  data.tar.gz: ded7e4a80713178e513f7b8d585e974fef763fb025d1d083f2574ecf553015cb519c059054ac4e61cae4ba33a30d0924b1f971ca2632cab08efa8e41a68562d7
+  metadata.gz: 41ec8840e1a72cfa879045f2f22b7cf10e165d9e47e7f4cad72005785f0be3b3b6c6229f2c210888637903497ad74289f1fea8f72646f2ece2119537837da16f
+  data.tar.gz: 69b6c7b790da0585527339c3b4ea593cd8da13c08ef751af82e83b0fa2af911015a4013a362479a4c2bc60f09d0ad4e992bcafa776463e783f423a56534943ac

data/.travis.yml

@@ -1,15 +1,20 @@
 language: ruby
-sudo: false
-dist: trusty
+dist: xenial
 cache: bundler
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - ruby-head
-  - jruby-head
+
 matrix:
+  include:
+    - rvm: 2.4
+    - rvm: 2.5
+    - rvm: 2.6
+    - rvm: 2.6
+      env: COVERAGE=Summary,Coveralls
+    - rvm: truffleruby
+    - rvm: ruby-head
+    - rvm: 2.6
+      os: osx
   allow_failures:
-    - rvm: "ruby-head"
-    - rvm: "jruby-head"
+    - rvm: truffleruby
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: truffleruby

data/README.md

@@ -31,18 +31,18 @@ Connect to a local database and manipulate some documents.
 	
 	DB.commit(message: "Create test data") do |dataset|
 		object = dataset.append(MessagePack.dump({bob: 'dole'}))
-		dataset.write("doc1.json", object)
+		dataset.write("doc1.msgpack", object)
 	end
 	
 	DB.commit(message: "Update test data") do |dataset|
-		doc = MessagePack.load dataset.read('doc1.json').data
+		doc = MessagePack.load dataset.read('doc1.msgpack').data
 		doc[:foo] = 'bar'
 		
 		object = dataset.append(MessagePack.dump(doc))
-		dataset.write("doc2.json", object)
+		dataset.write("doc2.msgpack", object)
 	end
 	
-	doc = MessagePack.load DB.current['doc2.json'].data
+	doc = MessagePack.load DB.current['doc2.msgpack'].data
 	puts doc
 	# => {"bob"=>"dole", "foo"=>"bar"}
 

data/lib/relaxo.rb

@@ -20,7 +20,8 @@
 
 require 'relaxo/database'
 
-require 'pry'
+require 'etc'
+require 'socket'
 
 module Relaxo
 	MASTER = 'master'.freeze
@@ -36,6 +37,18 @@ module Relaxo
 		
 		branch ||= MASTER
 		
-		return Database.new(path, branch, metadata)
+		database = Database.new(path, branch, metadata)
+		
+		if config = database.config
+			unless config['user.name']
+				login = Etc.getlogin
+				hostname = Socket.gethostname
+				
+				config['user.name'] = login
+				config['user.email'] = "#{login}@#{hostname}"
+			end
+		end
+		
+		return database
 	end
 end

data/lib/relaxo/database.rb

@@ -19,8 +19,8 @@
 # THE SOFTWARE.
 
 require 'rugged'
-require 'logger'
 
+require_relative 'logger'
 require_relative 'dataset'
 require_relative 'changeset'
 
@@ -32,13 +32,15 @@ module Relaxo
 			@path = path
 			@metadata = metadata
 			
-			@logger = metadata[:logger] || Logger.new($stderr).tap{|logger| logger.level = Logger::INFO}
-			
 			@repository = Rugged::Repository.new(path)
 			
 			@branch = branch
 		end
 		
+		def config
+			@repository.config
+		end
+		
 		attr :path
 		attr :metadata
 		attr :repository
@@ -127,7 +129,7 @@ module Relaxo
 			end_time = Time.now
 			elapsed_time = end_time - start_time
 			
-			@logger.debug("time") {"#{message.inspect}: %0.3fs" % elapsed_time}
+			Relaxo.logger.debug("time") {"#{message.inspect}: %0.3fs" % elapsed_time}
 		end
 		
 		def apply(parent, changeset, **options)

data/lib/relaxo/logger.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2012 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'console'
+
+module Relaxo
+	extend Console
+end

data/lib/relaxo/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Relaxo
-	VERSION = "1.4.0"
+	VERSION = "1.5.0"
 end

data/relaxo.gemspec

@@ -23,7 +23,9 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 	
 	spec.add_dependency "rugged"
+	spec.add_dependency "console"
 	
+	spec.add_development_dependency "covered"
 	spec.add_development_dependency "rspec", "~> 3.6"
 	spec.add_development_dependency "bundler", "~> 1.3"
 	spec.add_development_dependency "rake"

data/spec/relaxo/database_spec.rb

@@ -15,6 +15,13 @@ RSpec.describe Relaxo::Database do
 		expect(database).to be_empty
 	end
 	
+	it "prepares user details in config" do
+		expect(database.config).to include('user.name', 'user.email')
+		
+		puts database.config['user.name']
+		puts database.config['user.email']
+	end
+	
 	it "can clear database" do
 		expect do
 			database.clear!

data/spec/spec_helper.rb

@@ -1,23 +1,5 @@
 
-if ENV['COVERAGE'] || ENV['TRAVIS']
-	begin
-		require 'simplecov'
-		
-		SimpleCov.start do
-			add_filter "/spec/"
-		end
-		
-		if ENV['TRAVIS']
-			require 'coveralls'
-			Coveralls.wear!
-		end
-	rescue LoadError
-		warn "Could not load simplecov: #{$!}"
-	end
-end
-
-require "bundler/setup"
-require "relaxo"
+require 'covered/rspec'
 
 RSpec.configure do |config|
 	# Enable flags like --only-failures and --next-failure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaxo
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-30 00:00:00.000000000 Z
+date: 2019-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: covered
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +118,7 @@ files:
 - lib/relaxo/database.rb
 - lib/relaxo/dataset.rb
 - lib/relaxo/directory.rb
+- lib/relaxo/logger.rb
 - lib/relaxo/version.rb
 - relaxo.gemspec
 - spec/relaxo/changeset_spec.rb
@@ -118,8 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Relaxo is a helper for loading and working with CouchDB.