roku_builder 3.11.0 → 3.11.1

data/tests/roku_builder/stager_test.rb

@@ -285,5 +285,52 @@ class StagerTest < Minitest::Test
     stash.verify
     pstore.verify
   end
+
+  def test_stager_load_second_state
+    root_dir = File.join(File.dirname(__FILE__), "test_files", "stager_test")
+    branch_name = 'branch'
+    git = Minitest::Mock.new
+    branch = Minitest::Mock.new
+    stashes = Minitest::Mock.new
+    stash = Minitest::Mock.new
+    other_stash = Minitest::Mock.new
+    pstore = Minitest::Mock.new
+
+    stager_config = {
+      method: :git,
+      root_dir: root_dir,
+      key: branch_name,
+      logger: nil
+    }
+
+    pstore.expect(:transaction, nil) do |&block|
+     block.call
+    end
+    git.expect(:branches, ['other_branch'])
+    pstore.expect(:[], 'other_branch', [:current_branch])
+    pstore.expect(:[]=, nil, [:current_branch, nil])
+
+    git.expect(:branch, branch)
+    branch.expect(:stashes, [other_stash, stash])
+    git.expect(:checkout, nil, ['other_branch'])
+    git.expect(:branch, branch)
+    stash.expect(:message, "roku-builder-temp-stash")
+    other_stash.expect(:message, "random_messgae")
+    branch.expect(:stashes, stashes)
+    stashes.expect(:pop, nil, ["stash@{1}"])
+
+    Git.stub(:open, git) do
+      PStore.stub(:new, pstore) do
+        stager = RokuBuilder::Stager.new(**stager_config)
+        assert stager.unstage
+      end
+    end
+    git.verify
+    branch.verify
+    stashes.verify
+    stash.verify
+    other_stash.verify
+    pstore.verify
+  end
 end
 

data/tests/roku_builder/test_helper.rb

@@ -51,13 +51,19 @@ def good_config
         stages:{
           production: {
             branch: "production",
-            key: {
-              keyed_pkg: "/dev/null",
-              password: "<password for pkg>"
-            }
+            key: "a"
           }
         }
       }
+    },
+    keys: {
+      a: {
+        keyed_pkg: "/dev/null",
+        password: "password"
+      }
+    },
+    input_mapping: {
+      "a": ["home", "Home"]
     }
   }
 end

data/tests/roku_builder/tester_test.rb

@@ -20,7 +20,7 @@ class TesterTest < Minitest::Test
     }
     tester = RokuBuilder::Tester.new(**device_config)
 
-    loader.expect(:sideload, nil, [loader_config])
+    loader.expect(:sideload, [RokuBuilder::SUCCESS, ""], [loader_config])
     connection.expect(:waitfor, nil, [/\*\*\*\*\* ENDING TESTS \*\*\*\*\*/])
     connection.expect(:puts, nil, ["cont\n"])
 
@@ -55,7 +55,7 @@ class TesterTest < Minitest::Test
     }
     tester = RokuBuilder::Tester.new(**device_config)
 
-    loader.expect(:sideload, nil, [loader_config])
+    loader.expect(:sideload, [RokuBuilder::SUCCESS, ""], [loader_config])
     connection.expect(:waitfor, nil, &waitfor)
     connection.expect(:puts, nil, ["cont\n"])
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.11.1
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: faraday-digestauth
   requirement: !ruby/object:Gem::Requirement
@@ -346,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Build Tool for Roku Apps