dapp 0.1.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- NjE2N2UwNDhhMzAzYWM1YTEyNGY0YWJkM2UwYTEwYWQ0NjgxYzVmYw==
4
+ OGNiYzk4ODg4ZWRlZjlmZWM1ZGVhNWU0MzYwZjA3N2FlZGE0OTU2Mg==
5
5
  data.tar.gz: !binary |-
6
- NjIzMGU2ODk4ZTZiMGRmNmY1MjFiZmM0MTQ4MDMzMWFhYWE5OGYxNg==
6
+ OTJlNGZlNWNmMTcwNzA4OTQ4MDE1Yjk5NTRkNDFhMjcyYmI5OWRiYQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- YWYyNTE0M2JmZDkzZTAzNjAxNzYzNjMyYzZhMTVlNTJjM2I4OTUzMWE1MTkz
10
- MmRjMjJmMzE5ODE5MjNkZTE2ZjQwOWNiNjI1MWEwNjc2ZjMwOWMyY2YwZWU0
11
- N2JkMzg3MmI2MTUwNGQ4MTM3N2M0YjdkZjk3OWQwYTBiMWNmZGM=
9
+ M2I0M2FjM2JkZjJmNzljMThlM2Y0M2UzYzhiNjk4YTQxMjRiMDExZTcwOGUx
10
+ ODRlNTk0NWM3MTM4NWUxM2E4ZjVlYmFjYzgyZTE2NTdiOGI5MTc4MDI2MDBl
11
+ OTUyODM0MTVkOTQ0ZmI1MzYyZmNiYmVkN2IzN2JmM2NiNDFhMjc=
12
12
  data.tar.gz: !binary |-
13
- MzVjNzQ3MGE3NzVhOTU4YmFhMWE4ZTcwNGU3YmYyZjFiMGQwN2ZlNDJjZWI1
14
- MDYxZjQyMTBmMWVhYzNkYTZjNGJiN2JmZTAyNTQ4NDk3NzY3ZDRkMjIyMjE2
15
- NzVkMjdiN2YwMTY1YWFkYTE1NDA1YWIxMmFhOGU5NDRkODdlYzU=
13
+ YjRjNDc0MTllYmFmMGU4M2FlMGFjMWJkZDk5YWNmMDFmNmFhNWU4OTE5YzZi
14
+ YWU5YTFiMmU3MDg1ZGZlZjQ4NzdjODVlOGI0MDJkOWUwZjBlZDBiZDhkOGY3
15
+ YWE4ZWNjYjYwOGM1MmRmYjk0OTg3OGI5ODIzNmQ4YzI3ZWMxNjI=
@@ -42,6 +42,7 @@ require 'dapp/config/git_artifact'
42
42
  require 'dapp/config/docker'
43
43
  require 'dapp/builder/base'
44
44
  require 'dapp/builder/chef'
45
+ require 'dapp/builder/chef/cookbook_metadata'
45
46
  require 'dapp/builder/chef/berksfile'
46
47
  require 'dapp/builder/shell'
47
48
  require 'dapp/build/stage/base'
@@ -39,7 +39,7 @@ module Dapp
39
39
  private
40
40
 
41
41
  def project_name
42
- application.config._root_app._name # FIXME: parse name from metadata.rb
42
+ cookbook_metadata.name
43
43
  end
44
44
 
45
45
  def berksfile_path
@@ -50,6 +50,14 @@ module Dapp
50
50
  @berksfile ||= Berksfile.new(application.home_path, berksfile_path)
51
51
  end
52
52
 
53
+ def cookbook_metadata_path
54
+ application.home_path('metadata.rb')
55
+ end
56
+
57
+ def cookbook_metadata
58
+ @cookbook_metadata ||= CookbookMetadata.new(cookbook_metadata_path)
59
+ end
60
+
53
61
  def berksfile_lock_checksum
54
62
  path = application.home_path('Berksfile.lock')
55
63
  application.hashsum path.read if path.exist?
@@ -170,7 +178,7 @@ module Dapp
170
178
  "--user #{Process.uid}:#{Process.gid}",
171
179
  "--workdir #{berksfile_path.parent}",
172
180
  '--env BERKSHELF_PATH=/tmp/berkshelf',
173
- "ubuntu:14.04 /.dapp/deps/chefdk/bin/berks vendor #{cookbooks_vendor_path}"
181
+ "dappdeps/berksdeps:0.1.0 /.dapp/deps/chefdk/bin/berks vendor #{cookbooks_vendor_path}"
174
182
  ].join(' '),
175
183
  log_verbose: application.log_verbose?
176
184
  )
@@ -0,0 +1,39 @@
1
+ module Dapp
2
+ module Builder
3
+ class Chef < Base
4
+ # CookbookMetadata
5
+ class CookbookMetadata
6
+ # Parser
7
+ class Parser
8
+ def initialize(cookbook_metadata)
9
+ @cookbook_metadata = cookbook_metadata
10
+ parse
11
+ end
12
+
13
+ def name(name)
14
+ @cookbook_metadata.name = name
15
+ end
16
+
17
+ def version(version)
18
+ @cookbook_metadata.version = version
19
+ end
20
+
21
+ private
22
+
23
+ def parse
24
+ instance_eval(@cookbook_metadata.path.read, @cookbook_metadata.path.to_s)
25
+ end
26
+ end # Parser
27
+
28
+ attr_reader :path
29
+ attr_accessor :name
30
+ attr_accessor :version
31
+
32
+ def initialize(path)
33
+ @path = path
34
+ @parser = Parser.new(self)
35
+ end
36
+ end # CookbookMetadata
37
+ end # Chef
38
+ end # Builder
39
+ end # Dapp
@@ -1,5 +1,5 @@
1
1
  # Version
2
2
  module Dapp
3
- VERSION = '0.1.0'.freeze
3
+ VERSION = '0.1.1'.freeze
4
4
  BUILD_CACHE_VERSION = 1
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Stolyarov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-07-25 00:00:00.000000000 Z
11
+ date: 2016-07-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-shellout
@@ -347,6 +347,7 @@ files:
347
347
  - lib/dapp/builder/base.rb
348
348
  - lib/dapp/builder/chef.rb
349
349
  - lib/dapp/builder/chef/berksfile.rb
350
+ - lib/dapp/builder/chef/cookbook_metadata.rb
350
351
  - lib/dapp/builder/shell.rb
351
352
  - lib/dapp/cli.rb
352
353
  - lib/dapp/cli/base.rb