vice-editor 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 653e5d0a2a2e7aeb03bb3afe07a67c4396fa948975770a9656b8cd6bf65f0c4c
-  data.tar.gz: 48fa594f664bb81a51e131ac5e4683d5133c819605dabcf7cbbe1e9dc20cca65
+  metadata.gz: 8ea87ed282ee2df96d0a3f32c74f18a55b90a87d991d47327c30559b9deed763
+  data.tar.gz: 355574c2017cbf634fb8f7b98d8c02a87c95be41403c60992a0c4b4fce10bff1
 SHA512:
-  metadata.gz: f27ffff49999814fb674ae93995ca40c3aad785f74aeaa51a0f8cd104e70933f4e5d174b3e0841c5e5318aff113a569bceaa3c97e59aa5d5b2db90b22fa78758
-  data.tar.gz: 317f800f89486660ed2c7267ddccaaeab4fd77586a991646a0f0534836043d03c58d67c78c3cdb8e78919f080d484c9c6a910313565180dbdc6defc8a6e30ac1
+  metadata.gz: b03be081c958647a1251d9054db4a6e2cfa8314e67a9a6709049cb0b7f55c8d74349be728458c58088aabb11e37296dec71949c0a0858c0a6f8a39f86430f6db
+  data.tar.gz: 7a8ee61a59e5c8809e8ce69c05026b42d0b7ba04a83bb34c62a787b9e72ab5fc2ca5262a90c831d0f462134b68e475c6263e9dc31739249a3ee0cf2e3c78a4ae

data/README.md

@@ -7,7 +7,12 @@ vice (**vi**sual **c**ode **e**ditor) is a small vi-like editor. It is currently
 ## Installation
 Simply running `gem install vice-editor` should be sufficient to install vice. You can then execute `vice` to start the editor.
 
+## Configuration
+vice can be configured by creating a file at `~/.vicerc`. Your `.vicerc` should be a YAML file containing keys and fitting values as found in [constants.rb](https://github.com/knarka/vice/blob/master/lib/vice/constants.rb#L2). For an example, please look at [the example .vicerc files](https://github.com/knarka/vice/blob/master/extras) in this repository.
+
 ## Development
 Running: `rake`.
+
 Tests: `rake test`.
+
 Style: `rake style`.

data/lib/vice.rb

@@ -22,10 +22,10 @@ module Vice
 
 			@current_buffer = 0
 			if filenames.nil? || filenames.empty?
-				@buffers.push Buffer.new nil
+				@buffers.push Buffer.new(self, nil)
 			else
 				filenames.each do |f|
-					@buffers.push Buffer.new(f)
+					@buffers.push Buffer.new(self, f)
 					next_buffer
 				end
 			end
@@ -35,9 +35,28 @@ module Vice
 			defaults = DEFAULTS.clone
 
 			configfile = "#{Dir.home}/.vicerc"
+
+			unless File.file? configfile
+				@config = defaults
+				return
+			end
+
 			user_defined = File.open(configfile) { |f| YAML.safe_load(f.read) } if File.file? configfile
 
-			@config = user_defined.nil? ? defaults : defaults.merge(user_defined)
+			# merge the hashes, to up to two levels of depth.
+			# positive side-effect: our keys are symbols now
+			@config = {}
+			defaults.each do |dk, dv|
+				uv = user_defined[dk.to_s]
+				@config[dk] = if uv.nil?
+						      dv
+					      elsif uv.is_a? Hash
+						      uv = Hash[uv.map { |k, v| [k, v.to_sym] }]
+						      dv.merge(uv)
+					      else
+						      uv
+					      end
+			end
 		end
 
 		def start

data/lib/vice/blitter.rb

@@ -82,7 +82,7 @@ class Vice::Blitter
 
 		(0..buffer.cursor.col - 1).each do |i|
 			visual_cursor.col += if buffer.currentline[i] == "\t"
-						     vice.config['tab_width']
+						     vice.config[:tab_width]
 					     else
 						     1
 					     end
@@ -112,7 +112,7 @@ class Vice::Blitter
 			i = r - 1 + buffer.v_scroll
 			window.setpos r, 0
 			if i < buffer.lines
-				line = pad buffer.getline(i).gsub(/(\t)/, ' ' * vice.config['tab_width'])
+				line = pad buffer.getline(i).gsub(/(\t)/, ' ' * vice.config[:tab_width])
 				window.addstr formatnumber(i + 1) + line
 			else
 				window.addstr pad(formatnumber('~'))

data/lib/vice/buffer.rb

@@ -5,20 +5,28 @@ class Vice::Buffer
 	attr_accessor :cursor
 	attr_accessor :v_scroll
 
-	def initialize(filename)
+	def initialize(vice, filename)
 		@buffer = []
 		@marks = {}
+
+		@cursor = Vice::Cursor.new
+		@modified = false
+		@v_scroll = 0
+
 		if filename
 			@filename = filename
-			File.open(filename, 'r') do |f| # TODO: don't assume file exists
-				f.each_line { |line| @buffer.push line.chomp }
+
+			if File.file? filename
+				File.open(filename, 'r') do |f| # TODO: don't assume file exists
+					f.each_line { |line| @buffer.push line.chomp }
+				end
+			else
+				vice.alert 'new file'
+				@buffer.push ''
 			end
 		else
 			@buffer.push ''
 		end
-		@cursor = Vice::Cursor.new
-		@modified = false
-		@v_scroll = 0
 	end
 
 	def writef(filename)

data/lib/vice/parser.rb

@@ -36,8 +36,10 @@ class Vice::Parser
 	end
 
 	def parsechar_command(vice, current_buffer, char)
-		buffer = vice.buffers[current_buffer]
 		raise 'command parser called from wrong mode' unless vice.mode == :command
+		return if char.is_a? Integer
+
+		buffer = vice.buffers[current_buffer]
 
 		if %i[mark_set mark_jump].include? @current_command
 			Vice::KeyPress.public_send(@current_command, vice, buffer, char)
@@ -51,21 +53,23 @@ class Vice::Parser
 			if %i[mark_set mark_jump].include? command
 				@current_command = command
 			else
-				Vice::KeyPress.public_send(command, vice, buffer)
+				Vice::KeyPress.public_send(command, vice, buffer) if Vice::KeyPress.respond_to? command.to_sym
 				@current_command = ''
 			end
 		else
 			keep_current = false
 			vice.config[:keys].each do |k|
-				keep_current = true if k[0].start_with? @current_command
+				keep_current = true if k[0].to_s.start_with? @current_command
 			end
 			@current_command = '' unless keep_current
 		end
 	end
 
 	def parsechar_insert(vice, current_buffer, char)
-		buffer = vice.buffers[current_buffer]
 		raise 'insert parser called from wrong mode' unless vice.mode == :insert
+
+		buffer = vice.buffers[current_buffer]
+
 		case char
 		when 9
 			buffer.insert "\t"

data/lib/vice/prompt.rb

@@ -10,7 +10,7 @@ class Vice::Prompt
 				files.shift
 				vice.buffers.delete buffer unless buffer.modified || words[0] == 't'
 				files.each do |f|
-					vice.buffers.push Vice::Buffer.new(f)
+					vice.buffers.push Vice::Buffer.new(vice, f)
 				end
 			else
 				vice.error 'no such file'

data/lib/vice/version.rb

@@ -1,3 +1,3 @@
 module Vice
-	VERSION = '0.0.5'.freeze
+	VERSION = '0.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vice-editor
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - knarka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses