dapp 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjE2N2UwNDhhMzAzYWM1YTEyNGY0YWJkM2UwYTEwYWQ0NjgxYzVmYw==
+    OGNiYzk4ODg4ZWRlZjlmZWM1ZGVhNWU0MzYwZjA3N2FlZGE0OTU2Mg==
   data.tar.gz: !binary |-
-    NjIzMGU2ODk4ZTZiMGRmNmY1MjFiZmM0MTQ4MDMzMWFhYWE5OGYxNg==
+    OTJlNGZlNWNmMTcwNzA4OTQ4MDE1Yjk5NTRkNDFhMjcyYmI5OWRiYQ==
 SHA512:
   metadata.gz: !binary |-
-    YWYyNTE0M2JmZDkzZTAzNjAxNzYzNjMyYzZhMTVlNTJjM2I4OTUzMWE1MTkz
-    MmRjMjJmMzE5ODE5MjNkZTE2ZjQwOWNiNjI1MWEwNjc2ZjMwOWMyY2YwZWU0
-    N2JkMzg3MmI2MTUwNGQ4MTM3N2M0YjdkZjk3OWQwYTBiMWNmZGM=
+    M2I0M2FjM2JkZjJmNzljMThlM2Y0M2UzYzhiNjk4YTQxMjRiMDExZTcwOGUx
+    ODRlNTk0NWM3MTM4NWUxM2E4ZjVlYmFjYzgyZTE2NTdiOGI5MTc4MDI2MDBl
+    OTUyODM0MTVkOTQ0ZmI1MzYyZmNiYmVkN2IzN2JmM2NiNDFhMjc=
   data.tar.gz: !binary |-
-    MzVjNzQ3MGE3NzVhOTU4YmFhMWE4ZTcwNGU3YmYyZjFiMGQwN2ZlNDJjZWI1
-    MDYxZjQyMTBmMWVhYzNkYTZjNGJiN2JmZTAyNTQ4NDk3NzY3ZDRkMjIyMjE2
-    NzVkMjdiN2YwMTY1YWFkYTE1NDA1YWIxMmFhOGU5NDRkODdlYzU=
+    YjRjNDc0MTllYmFmMGU4M2FlMGFjMWJkZDk5YWNmMDFmNmFhNWU4OTE5YzZi
+    YWU5YTFiMmU3MDg1ZGZlZjQ4NzdjODVlOGI0MDJkOWUwZjBlZDBiZDhkOGY3
+    YWE4ZWNjYjYwOGM1MmRmYjk0OTg3OGI5ODIzNmQ4YzI3ZWMxNjI=

data/lib/dapp.rb

@@ -42,6 +42,7 @@ require 'dapp/config/git_artifact'
 require 'dapp/config/docker'
 require 'dapp/builder/base'
 require 'dapp/builder/chef'
+require 'dapp/builder/chef/cookbook_metadata'
 require 'dapp/builder/chef/berksfile'
 require 'dapp/builder/shell'
 require 'dapp/build/stage/base'

data/lib/dapp/builder/chef.rb

@@ -39,7 +39,7 @@ module Dapp
       private
 
       def project_name
-        application.config._root_app._name # FIXME: parse name from metadata.rb
+        cookbook_metadata.name
       end
 
       def berksfile_path
@@ -50,6 +50,14 @@ module Dapp
         @berksfile ||= Berksfile.new(application.home_path, berksfile_path)
       end
 
+      def cookbook_metadata_path
+        application.home_path('metadata.rb')
+      end
+
+      def cookbook_metadata
+        @cookbook_metadata ||= CookbookMetadata.new(cookbook_metadata_path)
+      end
+
       def berksfile_lock_checksum
         path = application.home_path('Berksfile.lock')
         application.hashsum path.read if path.exist?
@@ -170,7 +178,7 @@ module Dapp
                "--user #{Process.uid}:#{Process.gid}",
                "--workdir #{berksfile_path.parent}",
                '--env BERKSHELF_PATH=/tmp/berkshelf',
-               "ubuntu:14.04 /.dapp/deps/chefdk/bin/berks vendor #{cookbooks_vendor_path}"
+               "dappdeps/berksdeps:0.1.0 /.dapp/deps/chefdk/bin/berks vendor #{cookbooks_vendor_path}"
               ].join(' '),
               log_verbose: application.log_verbose?
             )

data/lib/dapp/builder/chef/cookbook_metadata.rb

@@ -0,0 +1,39 @@
+module Dapp
+  module Builder
+    class Chef < Base
+      # CookbookMetadata
+      class CookbookMetadata
+        # Parser
+        class Parser
+          def initialize(cookbook_metadata)
+            @cookbook_metadata = cookbook_metadata
+            parse
+          end
+
+          def name(name)
+            @cookbook_metadata.name = name
+          end
+
+          def version(version)
+            @cookbook_metadata.version = version
+          end
+
+          private
+
+          def parse
+            instance_eval(@cookbook_metadata.path.read, @cookbook_metadata.path.to_s)
+          end
+        end # Parser
+
+        attr_reader :path
+        attr_accessor :name
+        attr_accessor :version
+
+        def initialize(path)
+          @path = path
+          @parser = Parser.new(self)
+        end
+      end # CookbookMetadata
+    end # Chef
+  end # Builder
+end # Dapp

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
   BUILD_CACHE_VERSION = 1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -347,6 +347,7 @@ files:
 - lib/dapp/builder/base.rb
 - lib/dapp/builder/chef.rb
 - lib/dapp/builder/chef/berksfile.rb
+- lib/dapp/builder/chef/cookbook_metadata.rb
 - lib/dapp/builder/shell.rb
 - lib/dapp/cli.rb
 - lib/dapp/cli/base.rb