origen 0.34.1 → 0.34.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2c5ab746eab9de6a504359d2e3ec84205015d38
-  data.tar.gz: 2bd24969e2425d01978f11573d46fc35609133b4
+  metadata.gz: 96abf91083c2df0da8cb9cac42f82757fff7cf48
+  data.tar.gz: 78965ad2de07cb8524f32a423567542b586ee35a
 SHA512:
-  metadata.gz: 9e108f4fa70c0b10ba462e5ad8752a87b8a920858036f332c70d2fdcf2907d559479ff56ca1e1c7b1a11168a748e4f3611672a3b5408ddaab8e0edfe9cbf1edb
-  data.tar.gz: b59f33dce9c4e1dfcab71ab68a54ccd403b3aedeefd9b257cf0936637683f73834b1231aefc3027b944acba9f3bce95051ce18ef9984555f287abfd7d31c6fb1
+  metadata.gz: f725a9a8db4c9f368d583591957d8b248eb7489d5ecfae663860ddb3713591ee4018817835e81f3f3704ddc7f8d297b19c803a8106d51d1e526abeade461967b
+  data.tar.gz: 174dc22d5cdcc20d1fc219813fa5476e48f5b804343d31e7272ce43573fa3138da07d54d47240cf250818e25176f1034aad9b25474cacc7116f1b95963f85728

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 34
-  BUGFIX = 1
+  BUGFIX = 2
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen/commands/web.rb

@@ -166,7 +166,12 @@ The following options are available:
           listener.before_web_compile(options)
         end
         ARGV.each do |file|
-          output = Origen.file_handler.sub_dir_of(Origen.file_handler.clean_path_to(file), "#{Origen.root}/templates/web")
+          path = Origen.file_handler.clean_path_to(file)
+          if path.to_s =~ /origen_guides/
+            output = Origen.file_handler.sub_dir_of(path, "#{Origen.root}/templates/origen_guides")
+          else
+            output = Origen.file_handler.sub_dir_of(path, "#{Origen.root}/templates/web")
+          end
           Origen.app.runner.launch action: :compile,
                                    files:  file,
                                    output: "#{Origen.root}/web/content/#{output}"

data/lib/origen/org_file.rb

@@ -29,7 +29,7 @@ module Origen
       def close(id, options = {})
         fail "An org_file with this ID has not been opened id: #{id}" unless open_files[id]
         open_files[id].close unless options[:_internal_org_file_call_]
-        open_files[id] = nil
+        open_files.delete(id)
       end
 
       def org_file(id = nil)
@@ -109,15 +109,15 @@ module Origen
     def cycle(number)
       if @buffer
         if @line == @buffer
-          @buffer_cycles += 1
+          @buffer_cycles += number
         else
           file.puts "#{@buffer}#{@buffer_cycles}"
           @buffer = @line
-          @buffer_cycles = 1
+          @buffer_cycles = number
         end
       else
         @buffer = @line
-        @buffer_cycles = 1
+        @buffer_cycles = number
       end
       @line = nil
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.34.1
+  version: 0.34.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport