roku_builder 3.4.3 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bd482d491cdcd7d0fcdb0868cfd4a6a127b7550
-  data.tar.gz: aa79081e34db9e1de4b65178a051afe0fde5b5a4
+  metadata.gz: b2edf88ef8bebe2d25296ac9df69d5e79f645051
+  data.tar.gz: bebb326f1be6f127139a7a707a89c748fe455766
 SHA512:
-  metadata.gz: 6ac512ad7e5f80613cc1ec94f3ebc5da64ed55f98d2af28edafbc4905f36400239c972fefc0a123465bc645baaa9fc66586f885b7e5dc3e5d957d22528bbdac0
-  data.tar.gz: c5c10aafa9eef6d3dab2f7ee90c4279b0b5ef6fdc828eb9542fd8a403e8574ed9f0bd451a1f180f5b38b89f6de7de755755014644e4db985850bd618ebc6160a
+  metadata.gz: 670663b481d9f3c7a7a9d3504466b5b10e8ba1f6b8390ad2639345b80e09f1379d02897186d76751450cdb65c8e0e6b2fde55a41d22a8884727b5874dbf92aaa
+  data.tar.gz: 5aa407111a3c2cd822b9a19205dd55b0635985e29a8ed4c7348fe9a61a7519791c1e8e7cd36a058854e9a9614480e78aa74e8a22e289639df0e325855749b394

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roku_builder (3.4.3)
+    roku_builder (3.4.4)
       faraday (~> 0.9)
       faraday-digestauth (~> 0.2)
       git (~> 1.3)

data/lib/roku_builder/config_parser.rb

@@ -39,16 +39,19 @@ module RokuBuilder
     # @param config [Hash] The loaded config hash
     # @param options [Hash] The options hash
     def self.setup_project(config:, options:)
-      if options[:current] or not options[:project]
-        path = Controller.system(command: "pwd")
+      unless options[:project]
+        path = Pathname.pwd
         project = nil
         config[:projects].each_pair {|key,value|
           if value.is_a?(Hash)
-            repo_path = Pathname.new(value[:directory]).realdirpath.to_s
-            if path.start_with?(repo_path)
-              project = key
-              break
+            repo_path = Pathname.new(value[:directory]).realdirpath
+            path.descend do |path_parent|
+              if path_parent == repo_path
+                project = key
+                break
+              end
             end
+            break if project
           end
         }
         if project
@@ -86,7 +89,7 @@ module RokuBuilder
       #Create Project Config
       project_config = {}
       if options[:current]
-        pwd =  Controller.system(command: "pwd")
+        pwd =  Pathname.pwd.to_s
         return MISSING_MANIFEST unless File.exist?(File.join(pwd, "manifest"))
         project_config = {
           directory: pwd,

data/lib/roku_builder/version.rb

@@ -1,4 +1,4 @@
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "3.4.3"
+  VERSION = "3.4.4"
 end

data/tests/roku_builder/config_parser_test.rb

@@ -16,4 +16,26 @@ class ConfigParserTest < Minitest::Test
     assert_equal Hash, config.class
     assert_equal "/dev/null", configs[:manifest_config][:root_dir]
   end
+
+  def test_manifest_config_project_select
+    logger = Logger.new("/dev/null")
+    options = {
+      config: File.expand_path(File.join(File.dirname(__FILE__), "test_files", "controller_config_test", "valid_config.json")),
+      stage: 'production',
+      update_manifest: false,
+      fetch: false,
+    }
+    config = good_config
+
+    code = nil
+    configs = nil
+
+    Pathname.stub(:pwd, Pathname.new("/dev/nuller")) do
+      code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
+    end
+
+    assert_equal RokuBuilder::SUCCESS, code
+    assert_equal Hash, config.class
+    assert_equal "/dev/nuller", configs[:project_config][:directory]
+  end
 end

data/tests/roku_builder/test_helper.rb

@@ -39,6 +39,22 @@ def good_config
             }
           }
         }
+      },
+      project2: {
+        directory: "/dev/nuller",
+        folders: ["resources","source"],
+        files: ["manifest"],
+        app_name: "<app name>",
+        stage_method: :git,
+        stages:{
+          production: {
+            branch: "production",
+            key: {
+              keyed_pkg: "/dev/null",
+              password: "<password for pkg>"
+            }
+          }
+        }
       }
     }
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.4
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip