ecic 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1529013358fa74fc927995546738340500b80fcc80aaf96155a761a6696dbf4
-  data.tar.gz: 75a1426a8775b5d267ea9df4f3d32af6ab7f7f87dbbc37ae062f47d8a048ef4c
+  metadata.gz: 2227c73d15fbf63a514a2cc236f1162e90215ebc30a703b9f36dc99b1289a57e
+  data.tar.gz: 60e8e2010800a08549c8a96b1d173d491352e7dce15fa54d1cac00ee32393924
 SHA512:
-  metadata.gz: 9723f99531c5ef0d17d79360f647ca2f8c24329041c44adf7e769f8b0e09f9b3315694421eb736ba9355f7a2af530c9b23f445ce97e9dc9149eef5ab52597e4b
-  data.tar.gz: 5afaeb4239982741957301afcc184386d1db04701c6fce5f026b8389bc332b8b18c12a760c1364811ad9d38d7c88ee7cf8488be389756ecb3e7032186d540749
+  metadata.gz: 3614ce591502c236baff92a49a616dc2112690ab8b26e93cd8220e216a159642fd830f38415f41240c6cf2b27882044c9896c442da8402c3bbc0397ed56cb4b8
+  data.tar.gz: 44854b5887f98249e5454adc925ca964f93f09912fd22fa6c8785b6e7c4f513c1e01b133adb7d041c5ed6517be844bef89028a99179d86fadaf3bd39148e4dc1

data/lib/ecic/design_generator.rb

@@ -22,7 +22,6 @@ module Ecic
 
     def copy_rtl_templates
       base_name = "#{@library.path}/#{@design_name}"
-      @include_types_pkg ||= false
       if @include_types_pkg
         template("src/design/lib/pkg_types.vhd.tt", "#{base_name}-pkg_types.vhd")
       end
@@ -32,16 +31,14 @@ module Ecic
     end
 
     def update_src_list
-      src_file = "#{@library.path}/sources.rb"
+      src_file = File.join(destination_root,"#{@library.path}/sources.rb")  
       create_file src_file unless File.exists?(src_file)
-      @include_types_pkg ||= false
-      #TBA: update these cals to 'Pathname'
       if @include_types_pkg
-        append_to_file(src_file, "source_file('#{@design_name}-pkg_types.vhd')\n"
+        append_to_file(src_file, "source_file('#{@design_name}-pkg_types.vhd')\n")
       end
-      append_to_file(src_file, "source_file('#{@design_name}-pkg_comp.vhd')\n"
-      append_to_file(src_file, "source_file('#{@design_name}-ent.vhd')\n"
-      append_to_file(src_file, "source_file('#{@design_name}-arc_rtl.vhd')\n"
+      append_to_file(src_file, "source_file('#{@design_name}-pkg_comp.vhd')\n")
+      append_to_file(src_file, "source_file('#{@design_name}-ent.vhd')\n")
+      append_to_file(src_file, "source_file('#{@design_name}-arc_rtl.vhd')\n")
     end
 
   end

data/lib/ecic/generate.rb

@@ -83,7 +83,7 @@ module Ecic
         names.each { |design_name|
           incl_types_pkg = options[:types_package]
           if type == 'vhdl'
-            incl_types_pkg = yes?("Would you like to include a package for type and constant definitions for '#{design_name}'? [y/n]: ") if incl_types_pkg.nil?
+            incl_types_pkg = yes?("Would you like to include a package for type and constant definitions for '#{design_name}'? [y/N]: ") if incl_types_pkg.nil?
           else
             incl_types_pkg ||= false
             if incl_types_pkg
@@ -91,7 +91,6 @@ module Ecic
               exit(3)
             end
           end
-          #Tba 
           if type == 'vhdl'
             generator = DesignGenerator.new
             generator.include_types_pkg = incl_types_pkg

data/lib/ecic/helpers/library_creation_helper.rb

@@ -22,7 +22,7 @@ module Ecic::LibraryCreationHelper
       generator.destination_root = library.project.root
       generator.library = library
       generator.invoke_all
-      library.save
+      library.create
     else
       return false
     end
@@ -32,7 +32,7 @@ module Ecic::LibraryCreationHelper
   
   def must_create_new_library?(library)
     return true if @always_create_library
-    options = "[Ynaq]"
+    options = "[Ynaqh]"
     loop do
       answer = ask(
         %[#{library.type.to_s.capitalize} library '#{library.name}' does not exist. Create it? (enter "h" for help) #{options}],
@@ -58,11 +58,11 @@ module Ecic::LibraryCreationHelper
   end
   
   def library_creation_help
-    puts "Options:"
-    puts "  Yes     : Create the library (default)"
-    puts "  No      : Continue without creating the library"
-    puts "  All     : Create the library (and any additional libraries)"
-    puts "  Quit    : Abort operation"
+    puts "        Y - yes, create the library (default)"
+    puts "        n - no, continue without creating the library"
+    puts "        a - all, create this library (and any other)"
+    puts "        q - quit, abort"
+    puts "        h - help, show this help"
   end
   
   def is?(value) #:nodoc:

data/lib/ecic/library.rb

@@ -30,7 +30,7 @@ module Ecic
       end
     end
     
-    def save
+    def create
       validate_name
       @project.add_library self      
     end

data/lib/ecic/library_generator.rb

@@ -31,7 +31,7 @@ module Ecic
           cmd = "design_library('#{@library.name}', :path => '#{@library.path}')"
         end
       end
-      append_to_file 'src/config/libraries.rb', "#{cmd}\n"
+      append_to_file 'src/config/libraries.rb', "#{cmd}.create\n"
     end
 
   end

data/lib/ecic/project.rb

@@ -65,16 +65,12 @@ module Ecic
 
     #Function used in src/confic/libraries.rb
     def design_library(name, options={})
-      lib = Library.new(self, name, :design, options)
-      lib.save
-      lib
+      Library.new(self, name, :design, options)
     end
 
     #Function used in src/confic/libraries.rb
     def testbench_library(name, options={})
-      lib = Library.new(self, name, :testbench, options)
-      lib.save
-      lib
+      Library.new(self, name, :testbench, options)
     end
 
     def load_sources

data/lib/ecic/sv_design_generator.rb

@@ -16,7 +16,7 @@ module Ecic
     end
 
     def update_src_list
-      src_file = "#{@library.path}/sources.rb"
+      src_file = File.join(destination_root,"#{@library.path}/sources.rb")  
       create_file src_file unless File.exists?(src_file)
       append_to_file src_file, "source_file('#{@design_name}.sv')\n"
     end

data/lib/ecic/version.rb

@@ -1,3 +1,3 @@
 module Ecic
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecic
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Torben Fox Jacobsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-28 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor