rubyang 0.1.2.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: bc6990db46836bbcca07ed7e7b1bc4bb5a183e94cbeb7f7c671bcdb18e5bd454
-  data.tar.gz: 931778007ac7f6070a356fb23f52f82eab0abd2989e55f156f6bc3ec02279ae5
+SHA1:
+  metadata.gz: f1077d7b202071724495876ca2ac2a0d0c94291b
+  data.tar.gz: 8a5a8311e3ee8b649f1600450f8fbac074bb3780
 SHA512:
-  metadata.gz: 222f20d73796fa606bd7eebe671acf4ce92ec5c5685cab59ea25d8dcb935bd6486cd2565a640e250c042dce92bb6902637bbf49cba5359e204a72ee976953891
-  data.tar.gz: bfb45f1c46df476d7584c35811f2c2c0d8befac3fd07f1bd6c3029992291c5866f7839cfcd2032825bd799e759c3f7b79344b93bb861b791152ad0f98092871f
+  metadata.gz: be32311e6fa9a114418aba7fa9ed57e69502488ae433b22906bcfaf49e9e05809181792c636707bb82d243b28a16148c595c9023b48ff742ac216a15801b24c1
+  data.tar.gz: 21b3d0ef30a342af19317e540cb397ef8894075ae437c5838a92c0e78af35dcdb0c8971fb6803ccb9b04df87a034c965e9508fdeee0b9982cf398228be344167

data/.gitignore

@@ -10,6 +10,9 @@
 /test/version_tmp/
 /tmp/
 
+# rspec failure tracking
+.rspec_status
+
 ## Specific to RubyMotion:
 .dat*
 .repl_history

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+--require spec_helper

data/.travis.yml

@@ -4,7 +4,12 @@ env:
 sudo: false
 language: ruby
 rvm:
-  - 2.5.0
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
 before_install: gem install bundler -v 1.16.1
 install: bundle install --path vendor/bundle
 before_script:
@@ -13,7 +18,5 @@ before_script:
   - ./cc-test-reporter before-build
 script:
   - bundle exec rake spec
-  - bundle exec rake build
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-

data/lib/rubyang.rb

@@ -1,11 +1,10 @@
 # coding: utf-8
 
-require_relative 'rubyang/version'
-
-require_relative 'rubyang/logger'
-require_relative 'rubyang/model'
-require_relative 'rubyang/xpath'
-require_relative 'rubyang/database'
+require 'rubyang/version'
+require 'rubyang/compat'
+require 'rubyang/model'
+require 'rubyang/xpath'
+require 'rubyang/database'
 
 module Rubyang
 end

data/lib/rubyang/cli.rb

@@ -1,131 +1,131 @@
 # coding: utf-8
+# vim: et ts=2 sw=2
 
 require 'drb/drb'
 require 'readline'
-
-require_relative '../rubyang'
-require_relative 'cli/parser'
+require 'rubyang'
+require 'rubyang/cli/parser'
 
 module Rubyang
-	class Cli
-		def initialize
-			@sock_file = "/tmp/rubyang/server/Example.sock"
-			@db = DRbObject.new_with_uri( "drbunix:#{@sock_file}" )
+  class Cli
+    def initialize
+      @sock_file = "/tmp/rubyang/server/Example.sock"
+      @db = DRbObject.new_with_uri( "drbunix:#{@sock_file}" )
 
-			@config_tree = @db.configure
+      @config_tree = @db.configure
 
-			@fo = File.open("#{File.dirname(__FILE__)}/cli/log.txt", 'w')
-			@fo.sync = true
+      @fo = File.open("#{File.dirname(__FILE__)}/cli/log.txt", 'w')
+      @fo.sync = true
 
-			#Readline.basic_word_break_characters = ""
-			#Readline.completer_word_break_characters = ""
-			Readline.completion_append_character = " "
-			Readline.completion_proc = proc { |buf|
-				@fo.puts "line_buffer: #{Readline.line_buffer}"
-				begin
-					tokens = Rubyang::Cli::Parser.parse( Readline.line_buffer )
-				rescue
-					next
-				end
-				command_type = tokens.shift
-				case command_type
-				when /^set$/
-					if tokens.size == 0
-						all_candidates = ['set']
-						candidates = all_candidates
-					else
-						value = tokens.last.to_s
-						all_candidates = get_candidates( @config_tree, tokens )
-						candidates = all_candidates.grep(/^#{Regexp.escape(value.to_s)}/)
-					end
-				when /^show$/
-					format = tokens[0].to_s
-					all_candidates = ['xml', 'json']
-					candidates = all_candidates.grep(/^#{Regexp.escape(format.to_s)}/)
-					candidates
-				else
-					all_candidates = ['set', 'show']
-					candidates = all_candidates.grep(/^#{Regexp.escape(command_type.to_s)}/)
-					candidates
-				end
-				@fo.puts "tokens = #{tokens.inspect}"
-				@fo.puts "all_candidates = #{all_candidates.inspect}"
-				@fo.puts "candidates = #{candidates.inspect}"
-				@fo.puts
-				@fo.puts
-				candidates
-			}
-		end
+      #Readline.basic_word_break_characters = ""
+      #Readline.completer_word_break_characters = ""
+      Readline.completion_append_character = " "
+      Readline.completion_proc = proc { |buf|
+        @fo.puts "line_buffer: #{Readline.line_buffer}"
+        begin
+          tokens = Rubyang::Cli::Parser.parse( Readline.line_buffer )
+        rescue
+          next
+        end
+        command_type = tokens.shift
+        case command_type
+        when /^set$/
+          if tokens.size == 0
+            all_candidates = ['set']
+            candidates = all_candidates
+          else
+            value = tokens.last.to_s
+            all_candidates = get_candidates( @config_tree, tokens )
+            candidates = all_candidates.grep(/^#{Regexp.escape(value.to_s)}/)
+          end
+        when /^show$/
+          format = tokens[0].to_s
+          all_candidates = ['xml', 'json']
+          candidates = all_candidates.grep(/^#{Regexp.escape(format.to_s)}/)
+          candidates
+        else
+          all_candidates = ['set', 'show']
+          candidates = all_candidates.grep(/^#{Regexp.escape(command_type.to_s)}/)
+          candidates
+        end
+        @fo.puts "tokens = #{tokens.inspect}"
+        @fo.puts "all_candidates = #{all_candidates.inspect}"
+        @fo.puts "candidates = #{candidates.inspect}"
+        @fo.puts
+        @fo.puts
+        candidates
+      }
+    end
 
-		def set config_tree, tokens
-			set_recursive config_tree, tokens
-		end
+    def set config_tree, tokens
+      set_recursive config_tree, tokens
+    end
 
-		def set_recursive config_tree, tokens
-			return config_tree if tokens.size == 0
-			token = tokens[0]
-			case tokens[1..-1].size
-			when 0
-				config_tree.set token
-			else
-				child_tree = config_tree.edit token
-				set_recursive child_tree, tokens[1..-1]
-			end
-		end
+    def set_recursive config_tree, tokens
+      return config_tree if tokens.size == 0
+      token = tokens[0]
+      case tokens[1..-1].size
+      when 0
+        config_tree.set token
+      else
+        child_tree = config_tree.edit token
+        set_recursive child_tree, tokens[1..-1]
+      end
+    end
 
-		def get_candidates config_tree, tokens
-			@fo.puts config_tree.class
-			@fo.puts tokens.inspect
-			token = tokens[0].to_s
-			case config_tree
-			when Rubyang::Database::DataTree::Leaf
-				if tokens.size == 1
-					[config_tree.value]
-				else
-					[]
-				end
-			else
-				if tokens.size > 1 and config_tree.schema.children.map{ |c| c.arg }.include? token
-					child_tree = config_tree.edit token
-					get_candidates child_tree, tokens[1..-1]
-				else
-					config_tree.schema.children.map{ |c| c.arg }
-				end
-			end
-		end
+    def get_candidates config_tree, tokens
+      @fo.puts config_tree.class
+      @fo.puts tokens.inspect
+      token = tokens[0].to_s
+      case config_tree
+      when Rubyang::Database::DataTree::Leaf
+        if tokens.size == 1
+          [config_tree.value]
+        else
+          []
+        end
+      else
+        if tokens.size > 1 and config_tree.schema.children.map{ |c| c.arg }.include? token
+          child_tree = config_tree.edit token
+          get_candidates child_tree, tokens[1..-1]
+        else
+          config_tree.schema.children.map{ |c| c.arg }
+        end
+      end
+    end
 
-		def run
-			while buf = Readline.readline("> ", true)
-				tokens = Rubyang::Cli::Parser.parse( buf )
-				command_type = tokens.shift
-				case command_type
-				when /^set$/
-					begin
-						set @config_tree, tokens
-					rescue => e
-						puts "Error: #{e}"
-					end
-				when /^show$/
-					show_type = tokens.shift
-					case show_type
-					when /^xml$/
-						puts @config_tree.to_xml( pretty: true )
-					when /^json$/
-						puts @config_tree.to_json( pretty: true )
-					end
-				when /^commit$/
-					begin
-						@config_tree.commit
-					rescue => e
-						puts "Error: #{e}"
-					end
-				end
-			end
-		end
-	end
+    def run
+      while buf = Readline.readline("> ", true)
+        tokens = Rubyang::Cli::Parser.parse( buf )
+        command_type = tokens.shift
+        case command_type
+        when /^set$/
+          begin
+            set @config_tree, tokens
+          rescue => e
+            puts "Error: #{e}"
+          end
+        when /^show$/
+          show_type = tokens.shift
+          case show_type
+          when /^xml$/
+            puts @config_tree.to_xml( pretty: true )
+          when /^json$/
+            puts @config_tree.to_json( pretty: true )
+          end
+        when /^commit$/
+          begin
+            @config_tree.commit
+          rescue => e
+            puts "Error: #{e}"
+          end
+        end
+      end
+    end
+  end
 end
 
 if __FILE__ == $0
-	cli = Rubyang::Cli.new
-	cli.run
+  cli = Rubyang::Cli.new
+  cli.run
 end

data/lib/rubyang/cli/parser.rb

@@ -1,74 +1,74 @@
 # coding: utf-8
+# vim: et ts=2 sw=2
 
 require 'strscan'
-
-#require_relative 'parser/parser.tab.rb'
+#require 'rubyang/cli/parser/parser.tab.rb'
 
 module Rubyang
-	class Cli
-		class Parser
-			def self.parse( str )
-				parser = self.new
-				parser.parse( str )
-			end
+  class Cli
+    class Parser
+      def self.parse( str )
+        parser = self.new
+        parser.parse( str )
+      end
 
-			def initialize
-			end
+      def initialize
+      end
 
-			def parse( str )
-				@tokens = Array.new
+      def parse( str )
+        @tokens = Array.new
 
-				s = StringScanner.new( str )
+        s = StringScanner.new( str )
 
-				keywords = {
-				}
+        keywords = {
+        }
 
-				scanre_list = [
-					["dqstr", /^"(?:[^"]|\\.)*"/],
-					["sqstr", /^'(?:[^']|\\.)*'/],
-					["nqstr", /^[a-zA-Z0-9:\/\|\.=_-]+/],
-					["wsp",   /^[ \t]+/],
-				]
-				scanres = scanre_list.to_h
+        scanre_list = [
+          ["dqstr", /^"(?:[^"]|\\.)*"/],
+          ["sqstr", /^'(?:[^']|\\.)*'/],
+          ["nqstr", /^[a-zA-Z0-9:\/\|\.=_-]+/],
+          ["wsp",   /^[ \t]+/],
+        ]
+        scanres = scanre_list.to_h
 
-				scanre = Regexp.union( scanre_list.map{ |scanre| scanre[1] } )
+        scanre = Regexp.union( scanre_list.map{ |scanre| scanre[1] } )
 
-				last = ''
-				until s.eos?
-					token = s.scan( scanre )
-					case token
-					when scanres["dqstr"] then
-						token_ = token.gsub(/^"/,'').gsub(/"$/,'').gsub(/\\n/,"\n").gsub(/\\t/,"\t").gsub(/\\"/,"\"").gsub(/\\\\/,"\\")
-						@tokens.push token_
-						last = "dqstr"
-					when scanres["sqstr"] then
-						token_ = token.gsub(/^'/,'').gsub(/'$/,'')
-						@tokens.push token_
-						last = "sqstr"
-					when scanres["nqstr"] then
-						@tokens.push token
-						last = "nqstr"
-					when scanres["wsp"] then
-						last = "wsp"
-					else raise "token not match to any scanres: #{token.inspect}"
-					end
-				end
-				if last == "wsp"
-					@tokens.push ''
-				end
+        last = ''
+        until s.eos?
+          token = s.scan( scanre )
+          case token
+          when scanres["dqstr"] then
+            token_ = token.gsub(/^"/,'').gsub(/"$/,'').gsub(/\\n/,"\n").gsub(/\\t/,"\t").gsub(/\\"/,"\"").gsub(/\\\\/,"\\")
+            @tokens.push token_
+            last = "dqstr"
+          when scanres["sqstr"] then
+            token_ = token.gsub(/^'/,'').gsub(/'$/,'')
+            @tokens.push token_
+            last = "sqstr"
+          when scanres["nqstr"] then
+            @tokens.push token
+            last = "nqstr"
+          when scanres["wsp"] then
+            last = "wsp"
+          else raise "token not match to any scanres: #{token.inspect}"
+          end
+        end
+        if last == "wsp"
+          @tokens.push ''
+        end
 
-				#result = self.do_parse
-				return @tokens
-			end
+        #result = self.do_parse
+        return @tokens
+      end
 
-			def next_token
-				#p @tokens.first
-				@tokens.shift
-			end
-		end
-	end
+      def next_token
+        #p @tokens.first
+        @tokens.shift
+      end
+    end
+  end
 end
 
 if __FILE__ == $0
-	p Rubyang::Cli::Parser.parse "set aaa "
+  p Rubyang::Cli::Parser.parse "set aaa "
 end

data/lib/rubyang/compat.rb

@@ -0,0 +1,14 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+if RUBY_VERSION < "2.1"
+  class Array
+    def to_h
+      h = Hash.new
+      self.each do |k, v|
+        h[k] = v
+      end
+      h
+    end
+  end
+end