roku_builder 3.6.6 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ea74584f4460f3ab03af626f3005087d00b0229
-  data.tar.gz: e03c93389a91258cb1c7951c090a1f7c04b340b3
+  metadata.gz: b77bdbc22da34e8fdcdc5c1f975f656dd696d902
+  data.tar.gz: ac97ad95bf1b3ce94a112caccdad8190158ebb14
 SHA512:
-  metadata.gz: a909febdefc33b6a39d15b83a20b0cb0eda96bab9ef3f25cc79b823158539e8975c4bff6466aa0cef0d96057b260ee3f62dd383f70d5e10ada267e345789aa6a
-  data.tar.gz: 7e3ff144e18c67c3c87c0f6f9aba9f44240b9fbafba7497bd40c6cb7a7d3b655ddc76cfff98c40e6d4562636335682cd2856a20684f8348415475f0837f53e3b
+  metadata.gz: d20c6095f900ef0165ee91283d04dd655cb8b8a520cca07a556c2c163d3998752a684abb861ad33a5da099b4193455d9eaba1b86fd3fa1639023cfd166f5f1e9
+  data.tar.gz: 86be7326237f15678c14565df9f93c94aa5a504c21f9aab701ae7deeaa9e0693bbc8d3d088a38260e8680a0b11181d808231c4bf2c0891272cc41e4bade84410

data/Gemfile.lock

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

data/bin/roku

@@ -72,6 +72,14 @@ OptionParser.new do |opts|
     options[:print] = a
   end
 
+  opts.on("--do-stage", "Command: Run the stager. Used for scripting. Alwasy run --do-unscript after") do
+    options[:dostage] = true
+  end
+
+  opts.on("--do-unstage", "Command: Run the unstager. Used for scripting. Alwasy run --do-script first") do
+    options[:dounstage] = true
+  end
+
   opts.on("--screen SCREEN", "Command: show a screen") do |s|
     options[:screen] = s
   end

data/lib/roku_builder.rb

@@ -14,6 +14,8 @@ require "zip"
 require "git"
 #config_manager
 require 'json'
+#stager
+require 'pstore'
 
 require "roku_builder/controller"
 require "roku_builder/controller_commands"
@@ -158,3 +160,30 @@ class ::Hash
     self.merge(second, &merger)
   end
 end
+
+module Git
+  class Stashes
+    def pop(index=nil)
+      @base.lib.stash_pop(index)
+    end
+    def drop(index=nil)
+      @base.lib.stash_drop(index)
+    end
+  end
+  class Lib
+    def stash_pop(id = nil)
+      if id
+        command('stash pop', [id])
+      else
+        command('stash pop')
+      end
+    end
+    def stash_drop(id = nil)
+      if id
+        command('stash drop', [id])
+      else
+        command('stash drop')
+      end
+    end
+  end
+end

data/lib/roku_builder/controller.rb

@@ -162,7 +162,7 @@ module RokuBuilder
     def self.commands
       [:sideload, :package, :test, :deeplink,:configure, :validate, :delete,
         :navigate, :text, :build, :monitor, :update, :screencapture, :key, :screen,
-        :screens, :applist, :print]
+        :screens, :applist, :print, :dostage, :dounstage]
     end
 
     # List of depricated options

data/lib/roku_builder/controller_commands.rb

@@ -163,6 +163,16 @@ module RokuBuilder
       code
     end
 
+    def self.dostage(configs:)
+      stager = Stager.new(**configs[:stage_config])
+      stager.stage
+    end
+
+    def self.dounstage(configs:)
+      stager = Stager.new(**configs[:stage_config])
+      stager.unstage
+    end
+
     # Run a simple command
     # @param klass [Class] class of object to create
     # @param method [Symbol] methog to run on klass

data/lib/roku_builder/stager.rb

@@ -11,7 +11,7 @@ module RokuBuilder
       @root_dir = root_dir
       @logger = logger
       @stage_success = true
-      @orginal_directory = Dir.pwd
+      @stash_key = "roku-builder-temp-stash"
     end
 
     # Helper method to get the staging method being used
@@ -24,6 +24,7 @@ module RokuBuilder
     # Change the stage of the app depending on the method
     # @return [Boolean] whether the staging was successful or not
     def stage
+      @orginal_directory = Dir.pwd
       Dir.chdir(@root_dir) unless @root_dir == @orginal_directory
       case @method
       when :current
@@ -46,6 +47,8 @@ module RokuBuilder
     # Revert the change that the stage method made
     # @return [Boolean] whether the revert was successful or not
     def unstage
+      @orginal_directory ||= Dir.pwd
+      Dir.chdir(@root_dir) unless @root_dir == @orginal_directory
       unstage_success = true
       case @method
       when :current
@@ -73,10 +76,11 @@ module RokuBuilder
     def git_switch_to(branch:)
       if branch
         @git ||= Git.open(@root_dir)
-        if branch != @git.current_branch
+        if @git and branch != @git.current_branch
           @current_branch = @git.current_branch
-          @stash = @git.branch.stashes.save("roku-builder-temp-stash")
+          @git.branch.stashes.save(@stash_key)
           @git.checkout(branch)
+          save_state
         end
       end
     end
@@ -85,13 +89,45 @@ module RokuBuilder
     # @param branch [String] teh branch to switch from
     # @param checkout [Boolean] whether to actually run the checkout command
     def git_switch_from(branch:, checkout: true)
+      @current_branch ||= nil
       if branch
         @git ||= Git.open(@root_dir)
-        if @git and @current_branch
+        if @git and (@current_branch or load_state)
           @git.checkout(@current_branch) if checkout
-          @git.branch.stashes.apply if @stash
+          index = 0
+          @git.branch.stashes.each do |stash|
+            if stash.message == @stash_key
+              @git.branch.stashes.pop("stash@{#{index}}")
+              break
+            end
+            index += 1
+          end
+        end
+      end
+    end
+
+    # Save staging state to file
+    def save_state
+      store = PStore.new(File.expand_path("~/.roku_pstore"))
+      store.transaction do
+        store[:current_branch] = @current_branch.to_s
+      end
+    end
+
+    # Load staging state from file
+    def load_state
+      store = PStore.new(File.expand_path("~/.roku_pstore"))
+      store.transaction do
+        @git.branches.each do |branch|
+          if branch.to_s == store[:current_branch]
+            @current_branch = branch
+            store[:current_branch] = nil
+            break
+          end
         end
+        !!@current_branch
       end
+      !!@current_branch
     end
 
     # Called if resuce from git exception

data/lib/roku_builder/version.rb

@@ -2,5 +2,5 @@
 
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "3.6.6"
+  VERSION = "3.7.0"
 end

data/tests/roku_builder/stager_test.rb

@@ -45,6 +45,7 @@ class StagerTest < Minitest::Test
     git = Minitest::Mock.new
     branch = Minitest::Mock.new
     stashes = Minitest::Mock.new
+    stash = Minitest::Mock.new
 
     stager_config = {
       method: :git,
@@ -59,10 +60,13 @@ class StagerTest < Minitest::Test
     branch.expect(:stashes, stashes)
     stashes.expect(:save, true, ["roku-builder-temp-stash"])
     git.expect(:checkout, nil, [branch_name])
+    git.expect(:branch, branch)
+    branch.expect(:stashes, [stash])
     git.expect(:checkout, nil, ['other_branch'])
     git.expect(:branch, branch)
+    stash.expect(:message, "roku-builder-temp-stash")
     branch.expect(:stashes, stashes)
-    stashes.expect(:apply, nil)
+    stashes.expect(:pop, nil, ["stash@{0}"])
 
     Git.stub(:open, git) do
       stager = RokuBuilder::Stager.new(**stager_config)
@@ -72,6 +76,7 @@ class StagerTest < Minitest::Test
     git.verify
     branch.verify
     stashes.verify
+    stash.verify
   end
 
   def test_stager_stage_git_no_stash
@@ -94,7 +99,10 @@ class StagerTest < Minitest::Test
     branch.expect(:stashes, stashes)
     stashes.expect(:save, nil, ["roku-builder-temp-stash"])
     git.expect(:checkout, nil, [branch_name])
+
     git.expect(:checkout, nil, ['other_branch'])
+    git.expect(:branch, branch)
+    branch.expect(:stashes, [])
 
     Git.stub(:open, git) do
       stager = RokuBuilder::Stager.new(**stager_config)
@@ -112,6 +120,7 @@ class StagerTest < Minitest::Test
     git = Minitest::Mock.new
     branch = Minitest::Mock.new
     stashes = Minitest::Mock.new
+    stash = Minitest::Mock.new
     logger = Minitest::Mock.new
 
     stager_config = {
@@ -132,8 +141,11 @@ class StagerTest < Minitest::Test
     stashes.expect(:save, true, ["roku-builder-temp-stash"])
     logger.expect(:error, nil, ["Branch or ref does not exist"])
     git.expect(:branch, branch)
+    branch.expect(:stashes, [stash])
+    git.expect(:branch, branch)
+    stash.expect(:message, "roku-builder-temp-stash")
     branch.expect(:stashes, stashes)
-    stashes.expect(:apply, nil)
+    stashes.expect(:pop, nil, ["stash@{0}"])
 
     Git.stub(:open, git) do
       stager = RokuBuilder::Stager.new(**stager_config)
@@ -143,6 +155,7 @@ class StagerTest < Minitest::Test
     git.verify
     branch.verify
     stashes.verify
+    stash.verify
     logger.verify
   end
 
@@ -188,5 +201,89 @@ class StagerTest < Minitest::Test
       assert stager.unstage
     end
   end
+
+  def test_stager_save_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
+    pstore = Minitest::Mock.new
+
+    stager_config = {
+      method: :git,
+      root_dir: root_dir,
+      key: branch_name,
+      logger: nil
+    }
+
+    git.expect(:current_branch, 'other_branch')
+    git.expect(:current_branch, 'other_branch')
+    git.expect(:branch, branch)
+    branch.expect(:stashes, stashes)
+    stashes.expect(:save, 'stash', ["roku-builder-temp-stash"])
+    git.expect(:checkout, nil, [branch_name])
+
+    pstore.expect(:transaction, nil) do |&block|
+     block.call
+    end
+    pstore.expect(:[]=, nil, [:current_branch, 'other_branch'])
+
+
+    Git.stub(:open, git) do
+      PStore.stub(:new, pstore) do
+        stager = RokuBuilder::Stager.new(**stager_config)
+        assert stager.stage
+      end
+    end
+    git.verify
+    branch.verify
+    stashes.verify
+    pstore.verify
+  end
+
+  def test_stager_load_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
+    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, [stash])
+    git.expect(:checkout, nil, ['other_branch'])
+    git.expect(:branch, branch)
+    stash.expect(:message, "roku-builder-temp-stash")
+    branch.expect(:stashes, stashes)
+    stashes.expect(:pop, nil, ["stash@{0}"])
+
+    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
+    pstore.verify
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 3.6.6
+  version: 3.7.0
 platform: ruby
 authors:
 - greeneca