origen 0.0.9 → 0.1.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8ea392fb4ca3c95f6418cbbb4f1efd71bc2256f2
4
- data.tar.gz: 638a8ef6429898c0b4d7bc7d56353073af8e408f
3
+ metadata.gz: 60600910a8d7c8e6119a26ad602cf2b6c76563bb
4
+ data.tar.gz: 1684cd63234b701106a460213e0d47c74aa259fe
5
5
  SHA512:
6
- metadata.gz: 0d0bbd5acd19642897abfbd080d425819d02cb39e6eae5331102c4924a609f639f8167617fbec75da17687fb7e819871c1017d92d99946937389da95e46615aa
7
- data.tar.gz: 8bd6d58099593404cdcb73c96cbf3d5b3d3a27447eefb3f44e4dc25cd38e34704967d1eb36e6a160f775aa527360f7770874f29a58ad44b9f15ebd523cda6477
6
+ metadata.gz: a5ca056b7790296f2ed6e6863763eaece4a43f4d820e33e760ffcdab33aed385775b39afbdca579089ca5455c40b9e33cce97949c1464e43ffe431b5d6e36b90
7
+ data.tar.gz: 8370c2d81754809f03218a2605c73e3440c02f08648ec09bce63837cdffd255fe016aa4ece59f84f5383b81e320b499ee7473a40caf5aa0f5782d989ce5cdfad
data/bin/origen CHANGED
@@ -44,7 +44,7 @@ if origen_root
44
44
  # If it looks like a bundled binstub of origen exists, and we have not been invoked through that,
45
45
  # then run that instead.
46
46
  if Origen.site_config.gem_manage_bundler && File.exist?("#{origen_root}/lbin/origen") && !ENV["BUNDLE_BIN_PATH"] &&
47
- File.exist?(Origen.site_config.gem_install_dir)
47
+ File.exist?(File.expand_path(Origen.site_config.gem_install_dir))
48
48
  exec Gem.ruby, "#{origen_root}/lbin/origen", *ARGV
49
49
  exit 0
50
50
  else
@@ -85,7 +85,7 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
85
85
  result = false
86
86
 
87
87
  # Set this here since the clean environment will not have access to the ENV variable
88
- local_gem_dir = "#{ENV['BUNDLE_PATH']}/ruby/2.1.0"
88
+ local_gem_dir = "#{ENV['BUNDLE_PATH']}/ruby/#{Pathname.new(Gem.dir).basename}"
89
89
 
90
90
  Bundler.with_clean_env do
91
91
  if Origen.os.unix?
@@ -122,7 +122,7 @@ class OrigenCoreApplication < Origen::Application
122
122
 
123
123
  def after_release_email(tag, note, type, selector, options)
124
124
  begin
125
- command = "origen web compile --remote --api"
125
+ command = "origen web compile --remote --api --comment \"Release of #{RGen.app.name} #{RGen.app.version}\""
126
126
  Dir.chdir Origen.root do
127
127
  system command
128
128
  end
data/config/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Origen
2
2
  MAJOR = 0
3
- MINOR = 0
4
- BUGFIX = 9
3
+ MINOR = 1
4
+ BUGFIX = 0
5
5
  DEV = nil
6
6
 
7
7
  VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
@@ -25,7 +25,7 @@ module Origen
25
25
  def prepare!(options = {})
26
26
  if deploy_to_git?
27
27
  require 'highline/import'
28
- @commit_message = options[:message] || ask('Enter a deployment commit message: ') do |q|
28
+ @commit_message = options[:message] || options[:comment] || ask('Enter a deployment commit message: ') do |q|
29
29
  q.validate = /\w/
30
30
  q.responses[:not_valid] = "Can't be blank"
31
31
  end
File without changes
@@ -44,6 +44,7 @@ The following options are available:
44
44
  opts.on('-d', '--debugger', 'Enable the debugger') { options[:debugger] = true }
45
45
  opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', ' ' + Origen::Mode::MODES.join(', ')) { |_m| }
46
46
  opts.on('--no-serve', "Don't serve the website after compiling without the remote option") { options[:no_serve] = true }
47
+ opts.on('-c', '--comment', 'Supply a commit comment when deploying to Git') { |o| options[:comment] = o }
47
48
  app_options.each do |app_option|
48
49
  opts.on(*app_option) {}
49
50
  end
@@ -133,7 +134,7 @@ The following options are available:
133
134
  Origen.app.load_target!
134
135
  if options[:remote]
135
136
  _require_web_directory
136
- _deployer.prepare!
137
+ _deployer.prepare!(options)
137
138
  # If the whole site has been requested that start from a clean slate
138
139
  _build_web_dir if ARGV.empty?
139
140
  else
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: origen
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.9
4
+ version: 0.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stephen McGinty
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-07-11 00:00:00.000000000 Z
11
+ date: 2015-07-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -750,7 +750,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
750
750
  version: 1.8.11
751
751
  requirements: []
752
752
  rubyforge_project:
753
- rubygems_version: 2.4.8
753
+ rubygems_version: 2.4.5
754
754
  signing_key:
755
755
  specification_version: 4
756
756
  summary: A Semiconductor Developer's Kit