rggen 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ae419a5f6e280921fc5527d3e697856fdda719cb7b381a59f34cbb23cb6bcab
-  data.tar.gz: ca6ea865dd6abef639b4f171bba9899132a56ddaa3eeacffa43d003ded1e801a
+  metadata.gz: 8557db72205fd083dafe52498b9739d454ad263472beb66607409ca4641fd0b2
+  data.tar.gz: e5373123cdf438cf0a8d59a8c98d80268baaa3733eb97e76ff3b9215a3e5cd3a
 SHA512:
-  metadata.gz: 5e064c1d08c1dd8edc12253eecfd963b4b10da727741d66f56299732e3ac902ef35ecbdeed4b7d462e6ecdb983ee18ab237d1c7ebf5dde5fa98e326c7ee6a932
-  data.tar.gz: 99b98435e35e3c9b06ba268a623768ad70588dbecd16ccc9a6dd738933302cd72f36b57abbb89e547719ba3e875b0cd09c017d650bb95e38a31df0d639edb885
+  metadata.gz: c68809dcf02ebbc254eb88b7b54fde450213bfbbcdb18b0c83bfd319fdfa711fbda93b94108a3521a131e57b93db2ff2f689c8935a97c646a63bd6d7b40b08e9
+  data.tar.gz: a433ecd75b2c6ee8d2a34ecc654b0cf4672530bd5bc7f86c62e9db132cff032a757e6ad7098f8ca49573b5f6867b47335d1cdeccbbcde7824b83fcc1226a1785

data/lib/rggen/builtins/bit_field/reference.rb

@@ -2,7 +2,7 @@ simple_item :bit_field, :reference do
   register_map do
     field :reference, need_validation: true, forward_to: :find_reference
     field :has_reference? do
-      @reference.not.empty?
+      !(@reference.nil? || @reference.empty?)
     end
 
     build do |cell|

data/lib/rggen/builtins/loaders/register_map/csv_loader.rb

@@ -1,6 +1,4 @@
 loader :register_map, [:csv, :tsv] do
-  require 'csv'
-
   def load_file(file)
     create_map(file) do |map|
       sheet_name      = File.basename(file, '.*')

data/lib/rggen/builtins/loaders/register_map/xls_loader.rb

@@ -1,6 +1,4 @@
 loader :register_map, :xls do
-  require 'spreadsheet'
-
   def load_file(file)
     create_map(file) do |map|
       load_spreadsheet(file).each do |worksheet|

data/lib/rggen/builtins/loaders/register_map/xlsx_ods_loader.rb

@@ -1,6 +1,4 @@
 loader :register_map, [:xlsx, :ods] do
-  require 'roo'
-
   def load_file(file)
     create_map(file) do |map|
       load_spreadsheet(file).each do |sheet_name, sheet|
@@ -12,13 +10,12 @@ loader :register_map, [:xlsx, :ods] do
   def load_spreadsheet(file)
     sheets  = {}
     Roo::Spreadsheet.open(file).each_with_pagename do |sheet_name, sheet|
-      next unless sheet.first_row
-      sheets[sheet_name]  = 1.upto(sheet.last_row).map do |row|
-        1.upto(sheet.last_column).map do |column|
-          sheet.cell(row, column)
-        end
-      end
+      sheet.first_row && (sheets[sheet_name] = process_sheet(sheet))
     end
     sheets
   end
+
+  def process_sheet(sheet)
+    sheet.to_table(from_column: 1)
+  end
 end

data/lib/rggen/core_extensions/facets.rb

@@ -1,18 +1,16 @@
 require 'facets/enumerable/exclude'
 require 'facets/enumerable/find_yield'
-require 'facets/enumerable/sum' unless Enumerable.public_method_defined?(:sum)
+require 'facets/enumerable/sum' if RUBY_VERSION < '2.4'
 require 'facets/file/ext'
 require 'facets/hash/symbolize_keys'
 require 'facets/integer/multiple'
 require 'facets/kernel/attr_singleton'
 require 'facets/kernel/not'
 require 'facets/kernel/not_nil'
-require 'facets/method/curry' unless Method.public_method_defined?(:curry)
 require 'facets/module/attr_class_accessor'
 require 'facets/module/attr_setter'
 require 'facets/module/lastname'
 require 'facets/numeric/positive'
-require 'facets/object/itself' unless Object.public_method_defined?(:itself)
 require 'facets/pathname/to_path'
 require 'facets/pathname/to_str'
 require 'facets/range/overlap'

data/lib/rggen/core_extensions/roo.rb

@@ -0,0 +1,17 @@
+module Roo
+  module TableFormatter
+    def to_table(sheet = default_sheet, **options)
+      from_row    = options[:from_row]    || first_row(sheet)
+      to_row      = options[:to_row]      || last_row(sheet)
+      from_column = options[:from_column] || first_column(sheet)
+      to_column   = options[:to_column]   || last_column(sheet)
+      from_row.upto(to_row).map do |row|
+        from_column.upto(to_column).map { |column| cell(row, column, sheet) }
+      end
+    end
+  end
+
+  class Base
+    include TableFormatter
+  end
+end

data/lib/rggen/version.rb

@@ -1,6 +1,6 @@
 module RgGen
   MAJOR   = 0
   MINOR   = 8
-  TEENY   = 0
+  TEENY   = 1
   VERSION = "#{MAJOR}.#{MINOR}.#{TEENY}".freeze
 end

data/lib/rggen.rb

@@ -4,6 +4,9 @@ module RgGen
   require 'pathname'
   require 'optparse'
   require 'erubi'
+  require 'csv'
+  require 'roo'
+  require 'spreadsheet'
 
   require_relative 'rggen/version'
   require_relative 'rggen/rggen_home'
@@ -15,6 +18,7 @@ module RgGen
   require_relative 'rggen/core_extensions/forwardable'
   require_relative 'rggen/core_extensions/integer'
   require_relative 'rggen/core_extensions/math'
+  require_relative 'rggen/core_extensions/roo'
 
   require_relative 'rggen/base/hierarchical_accessors'
   require_relative 'rggen/base/hierarchical_item_accessors'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -257,6 +257,7 @@ files:
 - lib/rggen/core_extensions/forwardable.rb
 - lib/rggen/core_extensions/integer.rb
 - lib/rggen/core_extensions/math.rb
+- lib/rggen/core_extensions/roo.rb
 - lib/rggen/exceptions.rb
 - lib/rggen/generator.rb
 - lib/rggen/input_base/component.rb
@@ -339,8 +340,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: Code generation tool for control registers in a SoC design.