origen 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64c45eb89cc8ad305b8cf99ada8741d36a745c1b
-  data.tar.gz: 343beb79e30953b72ea3f048a7676e065538817d
+  metadata.gz: 5afcd7f71e51997df636ad0b74093dd23b8b03f1
+  data.tar.gz: cbbc0db307f8cf931afe7265a371e70de507b37c
 SHA512:
-  metadata.gz: 25d2cd159aa19e7c50b4cb8982aa4b7fd777da7e312545ec12917bc6a642afafc0a549368d8265bca7934a52b36899f5f865a67556e6a748c783166e8780105f
-  data.tar.gz: f599582cd7e4048a7d2169365cb783d129f342027a866e46e260c90e9d19ababbdc9f8b19cad64b81c1c9399c6e8a93933e0675c750741a015a5380a88916633
+  metadata.gz: 7255a4de2df19ef8751fbefd7ed6967527a863814b2080728c78aca3b5b8a18205e3c0d2b3c8f28b18149a5dacdad69cded05701f77347eb7fd595571829de50
+  data.tar.gz: cd99fc87b5b56defef22d49dd07688d53d4692256a83a7127a9a984eb820f15f25c5e400044ddab2dd3e46cb259c0b4c1f496fefc0943a150cad02f127f6abc8

data/config/version.rb

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

data/lib/origen/commands.rb

@@ -264,7 +264,12 @@ when 'modifications'
   load 'origen/commands/rc.rb'
 
 else
-  puts "Error: Command not recognized: #{@command}" unless ['-h', '--help'].include?(@command)
+  if ['-h', '--help'].include?(@command)
+    status = 0
+  else
+    puts "Error: Command not recognized: #{@command}"
+    status = 1
+  end
   puts <<-EOT
 Usage: origen COMMAND [ARGS]
 
@@ -306,6 +311,5 @@ Many commands can be run with -h (or --help) for more information.
 
   EOT
 
-  # dispatch     Dispatch an Origen command to a worker farm
-  exit(1)
+  exit status
 end

data/lib/origen/generator/pattern.rb

@@ -232,7 +232,9 @@ module Origen
           end
         end
         c2 "    Version:   #{Origen.app.version}"
-        c2 "    Workspace: #{Origen.root}"
+        unless Origen.app.config.release_externally
+          c2 "    Workspace: #{Origen.root}"
+        end
         if Origen.app.rc && Origen.app.rc.git?
           begin
             @branch ||= Origen.app.rc.current_branch
@@ -249,7 +251,6 @@ module Origen
         c2 '  Origen'
         c2 '    Source:    https://github.com/Origen-SDK/origen'
         c2 "    Version:   #{Origen.version}"
-        c2 "    Workspace: #{Origen.top}"
         unless Origen.plugins.empty?
           c2 '  Plugins'
           Origen.plugins.sort_by { |p| p.name.to_s }.each do |plugin|

data/templates/shared/web/_logo.html

@@ -1,10 +1,4 @@
-<div class="pull-right logo-rgen" style="margin-top: 5px; margin-left: 5px">
-  <a href="http://origen-sdk.org" style="text-decoration: none; color: #ffffff; font-weight: 500; font-size: 30px; font-family: 'Roboto','Helvetica Neue',Helvetica,Arial,sans-serif;">
-  <span>Origen</span>
-  </a>
-</div>
-<div class="pull-right">
-  <a href="http://origen-sdk.org">
-    <img src="http://origen-sdk.org/android-chrome-48x48.png" style="height:40px; margin-top: 5px;">
-  </a>
-</div>
+<a href="http://origen-sdk.org"class=" pull-right">
+  <img src="http://origen-sdk.org/img/origen-device.png" style="height:40px; margin-top: 5px;">
+  <img src="http://origen-sdk.org/img/origen-text.png" style="height:20px; margin-top: 5px; margin-left: 3px;">
+</a>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -722,7 +722,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Semiconductor Developer's Kit