nucleon 0.2.7 → 0.2.8

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: d10a46930f8caf3251ae8b76d41b6ab9b62d574e
4
- data.tar.gz: 985081596d90a480a7ec1db3d632942d22b679af
3
+ metadata.gz: 8fd07e548011fc3f3fbb033c7ff585caf7260f00
4
+ data.tar.gz: a2cb9ff231bd2a0f8d80e54734ba6fafa399d286
5
5
  SHA512:
6
- metadata.gz: 7955a1fd5c4816170b7aedcbcede162b309bccad724c47a8f502e213ebade046ad8f324283a60acbf2c190de5ff5bfe1018513ccae142aae6ff150582d6a7d0b
7
- data.tar.gz: 57d13dce28164b20c48ea994df8c612021f76ad2e61b64a245a60b69188858c259f1c144545d5be6d3cde9f22700642916d23b7cefdbad54c5418894e6409eca
6
+ metadata.gz: 6ec818f5a9bc9e3b366136c4c6436d259c8f85032d942a2019aa35a581b89a602f0f42e2ad2ccf2546aed5fb1fa37b6fb626832e8fb59f0cef198981a4d5682b
7
+ data.tar.gz: c58c888e3e05b6201a5bdd986e74290d6abdc689c0975036cb33792e4fb6b706e2906166060096bceba00f4143f4eee18f14cd98f64d6d0aef22ec33c58abfe4
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.7
1
+ 0.2.8
@@ -3,49 +3,50 @@ module Nucleon
3
3
  module Mixin
4
4
  module Action
5
5
  module Project
6
-
6
+
7
7
  #-----------------------------------------------------------------------------
8
8
  # Settings
9
-
9
+
10
10
  def project_config
11
- register_project_provider :project_provider, nil, [
12
- 'nucleon.core.mixin.action.project.options.project_provider',
13
- 'nucleon.core.mixin.action.project.errors.project_provider'
11
+ register_project_provider :project_provider, nil, [
12
+ 'nucleon.core.mixin.action.project.options.project_provider',
13
+ 'nucleon.core.mixin.action.project.errors.project_provider'
14
14
  ]
15
- register_project :project_reference, nil, [
16
- 'nucleon.core.mixin.action.project.options.project_reference',
17
- 'nucleon.core.mixin.action.project.errors.project_reference'
15
+ register_project :project_reference, nil, [
16
+ 'nucleon.core.mixin.action.project.options.project_reference',
17
+ 'nucleon.core.mixin.action.project.errors.project_reference'
18
18
  ]
19
19
  register_str :project_revision, :master, 'nucleon.core.mixin.action.project.options.project_revision'
20
20
  end
21
-
21
+
22
22
  #---
23
-
23
+
24
24
  def project_ignore
25
25
  [ :project_provider, :project_reference, :project_revision ]
26
26
  end
27
-
27
+
28
28
  #-----------------------------------------------------------------------------
29
29
  # Operations
30
-
30
+
31
31
  def project_load(root_dir, create = false, update = false)
32
-
32
+
33
33
  # 1. Set a default project provider (reference can override)
34
34
  # 2. Get project from root directory
35
35
  # 3. Initialize project if not yet initialized if requested
36
36
  # 4. Set remote if needed
37
37
  # 5. Checkout revision if needed
38
38
  # 6. Pull down updates if requested
39
-
39
+
40
40
  return Nucleon.project(extended_config(:project, {
41
- :create => create,
42
- :provider => settings[:project_provider],
43
- :directory => root_dir,
44
- :url => settings[:project_reference],
45
- :revision => settings[:project_revision],
46
- :pull => update
41
+ :create => create,
42
+ :provider => settings[:project_provider],
43
+ :directory => root_dir,
44
+ :url => settings[:project_reference],
45
+ :revision => settings[:project_revision],
46
+ :pull => update,
47
+ :nucleon_resave => true
47
48
  }))
48
- end
49
+ end
49
50
  end
50
51
  end
51
52
  end
@@ -413,14 +413,12 @@ class Git < Nucleon.plugin_class(:nucleon, :project)
413
413
  # SSH operations
414
414
 
415
415
  def git_fetch(remote = :origin, options = {}, &block)
416
- config = Config.ensure(options)
417
- local_revision = config.get(:revision, get(:revision, :master))
418
-
416
+ config = Config.ensure(options)
419
417
  result = cli.fetch({}, remote, &block)
420
418
 
421
419
  if result.status == code.success
422
420
  new?(true)
423
- checkout(local_revision)
421
+ true
424
422
  else
425
423
  false
426
424
  end
@@ -433,21 +431,15 @@ class Git < Nucleon.plugin_class(:nucleon, :project)
433
431
  return super do |config, processed_remote|
434
432
  success = false
435
433
 
436
- if new? || get(:create, false)
437
- success = git_fetch(processed_remote, config)
438
- end
439
-
440
434
  pull_options = {}
441
435
  pull_options[:tags] = true if config.get(:tags, true)
442
436
 
443
437
  local_revision = config.get(:revision, get(:revision, :master))
444
438
 
445
- if checkout(local_revision)
446
- result = cli.pull(pull_options, processed_remote, local_revision, &block)
447
-
448
- if result.status == code.success
449
- new?(true)
450
- success = true
439
+ if git_fetch(processed_remote, config)
440
+ if checkout(local_revision)
441
+ result = cli.pull(pull_options, processed_remote, local_revision, &block)
442
+ success = true if result.status == code.success
451
443
  end
452
444
  end
453
445
  success
@@ -2,16 +2,16 @@
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
3
  # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
- # stub: nucleon 0.2.7 ruby lib
5
+ # stub: nucleon 0.2.8 ruby lib
6
6
 
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "nucleon"
9
- s.version = "0.2.7"
9
+ s.version = "0.2.8"
10
10
 
11
11
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
12
12
  s.require_paths = ["lib"]
13
13
  s.authors = ["Adrian Webb"]
14
- s.date = "2015-01-19"
14
+ s.date = "2015-02-03"
15
15
  s.description = "\nA framework that provides a simple foundation for building Ruby applications that are:\n\n* Highly configurable (with both distributed and persistent configurations)\n* Extremely pluggable and extendable\n* Easily parallel\n\nNote: This framework is still very early in development!\n"
16
16
  s.email = "adrian.webb@coralnexus.com"
17
17
  s.executables = ["nucleon"]
@@ -111,7 +111,7 @@ Gem::Specification.new do |s|
111
111
  s.rdoc_options = ["--title", "Nucleon", "--main", "README.rdoc", "--line-numbers"]
112
112
  s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
113
113
  s.rubyforge_project = "nucleon"
114
- s.rubygems_version = "2.4.3"
114
+ s.rubygems_version = "2.4.5"
115
115
  s.summary = "Easy and minimal framework for building extensible distributed applications"
116
116
 
117
117
  if s.respond_to? :specification_version then
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nucleon
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.7
4
+ version: 0.2.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adrian Webb
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-01-19 00:00:00.000000000 Z
11
+ date: 2015-02-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: log4r
@@ -361,9 +361,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
361
361
  version: '0'
362
362
  requirements: []
363
363
  rubyforge_project: nucleon
364
- rubygems_version: 2.4.3
364
+ rubygems_version: 2.4.5
365
365
  signing_key:
366
366
  specification_version: 4
367
367
  summary: Easy and minimal framework for building extensible distributed applications
368
368
  test_files: []
369
- has_rdoc: