snow_sync 2.0.7 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8959b005796890c1ef02a1ea1f96495a3b12d1e3
-  data.tar.gz: 9115e5849752459463d4eb0b6f1ce6cf25e5c71e
+  metadata.gz: 291450da560ad042fd30195c1d5af042c4ff48b4
+  data.tar.gz: 1760e8efa915a578052e08cefc5873becf7a128d
 SHA512:
-  metadata.gz: 44710ba7a25e35b0e47a377d2e5bfdd926d4aa225c854f683ad131df8ca4f86deadb69771927231302abee383f79ea176a38dbbde70fd44fd3fd739825961598
-  data.tar.gz: 7c0b1ffa3930496d20d7650928eda35e6f5da708d4a4a7553aade42a58b8cd5651b3db2d78ea08bae94a1f67143e3462611a8d3f65b1411778e7bfb64bfc6602
+  metadata.gz: 351fe385067754cccb985ae275e12616e5727dc6753a8c602a75542df3e5cc3a4ae33ffe41f7f85d01e98c1b6940d0a81d31122ccb8bce8feb4d43267e92f5f3
+  data.tar.gz: 42568f36c2e279d3dd3cade31af8af0449a3f7483a3f03bfe5b0968ecc65de5d3f9202da209c60fda7536549f5d1d26c8a95c4863475ce96200d072686988a25

data/lib/snow_sync/configs.yml

@@ -11,5 +11,5 @@ table_map:
   script_include:
     name:
     table:
-    sysid:
+    sys_id:
     field:

data/lib/snow_sync/sync_util.rb

@@ -32,6 +32,14 @@ module SnowSync
       end
     end
 
+    # Creates a subdirectory if no directory exists
+    # @param [String] name Required directory name
+    # @param [Object] &block Optional directory path
+
+    def create_subdirectory(name, &block)
+      create_directory(name, &block)
+    end
+
     # Creates a JS file & logs the file creation
     # @param [String] name Required file name
     # @param [Object] json Required json object
@@ -81,25 +89,34 @@ module SnowSync
       end
     end
 
-    # Requests, retrieves, sets up the JS script file locally
+    # Creates the dir structure, requests, retrieves & sets up JS files locally
     
-    def setup_sync_directories
+    def run_setup_and_sync
+      # sync directory boolean tracks sync dir creation
+      # necessary for iterative subdir creation and re-syncs
+      sync_directory = File.directory?("sync")
+      directory_name = "sync"
       @configs["table_map"].each do |key, value|
-        directory_name = "sync"
-        create_directory(directory_name)
-        path = proc { FileUtils.cd(directory_name) }
-        sub_directory_name = key
-        create_directory(sub_directory_name, &path)
+        subdirectory_name = key
+        if sync_directory
+          path = proc { FileUtils.cd(directory_name) }
+          create_subdirectory(subdirectory_name, &path)
+        else
+          create_directory(directory_name)
+          path = proc { FileUtils.cd(directory_name) }
+          create_subdirectory(subdirectory_name, &path)
+          sync_directory = "true"
+        end
         begin
           user = Base64.strict_decode64(@configs["creds"]["user"])
           pass = Base64.strict_decode64(@configs["creds"]["pass"])
           response = RestClient.get(
           "#{@configs['base_url']}#{value["table"]}?sysparm_query=sys_id%3D" + 
-          "#{value["sysid"]}%5Ename%3D#{value["name"]}",
+          "#{value["sys_id"]}%5Ename%3D#{value["name"]}",
             {:authorization => "#{"Basic " + Base64.strict_encode64("#{user}:#{pass}")}",
              :accept => "application/json"})
-          path = proc { FileUtils.cd(sub_directory_name) }
-          @configs[value["table"] + "_response"] = JSON.parse(response)["result"][0]
+          path = proc { FileUtils.cd(subdirectory_name) }
+          @configs["table_map"][key]["response"] = JSON.parse(response)["result"][0]
           json = JSON.parse(response)["result"][0][value["field"]]
           name = value["name"].snakecase
           create_file(name, json, &path)
@@ -133,12 +150,13 @@ module SnowSync
 
     # Merges JS file changes with the encapsulated table response value
     # @param [String] file JS file path
+    # @param [String] type Servicenow script type
     # @param [Hash] table_hash Configured servicenow table hash
 
-    def merge_update(file, table_hash)
+    def merge_update(file, type, table_hash)
       FileUtils.cd(file.split("/")[0..1].join("/"))
       script_body = File.open(file.split("/").last).read
-      @configs[table_hash["table"] + "_response"] = script_body
+      @configs["table_map"][type]["mod"] = script_body
       FileUtils.cd("../..")
     end
 
@@ -147,7 +165,7 @@ module SnowSync
     def start_sync
       check_required_configs
       encrypt_credentials
-      setup_sync_directories
+      run_setup_and_sync
     end
 
     # Merges all JS file changes & pushes to the configured servicenow instance
@@ -156,15 +174,16 @@ module SnowSync
     def push_modifications(files)
       files.each do |file|
         file.downcase!
+        type = file.split("/")[1]
         table_hash = table_lookup(file)
-        merge_update(file, table_hash)
+        merge_update(file, type, table_hash)
         begin
           user = Base64.strict_decode64(@configs["creds"]["user"])
           pass = Base64.strict_decode64(@configs["creds"]["pass"])
           request_body_map = { 
-            table_hash["field"].to_sym => @configs[table_hash["table"] + "_response"] 
+            table_hash["field"].to_sym => @configs["table_map"][type]["mod"]
           }
-          response = RestClient.patch("#{@configs['base_url']}#{table_hash["table"]}/#{table_hash["sysid"]}", 
+          response = RestClient.patch("#{@configs['base_url']}#{table_hash["table"]}/#{table_hash["sys_id"]}", 
           request_body_map.to_json,
             {:authorization => "#{"Basic " + Base64.strict_encode64("#{user}:#{pass}")}",
              :content_type => "application/json", :accept => "application/json"})

data/lib/snow_sync/version.rb

@@ -1,3 +1,3 @@
 module SnowSync
-  VERSION = "2.0.7"
+  VERSION = "3.0.0"
 end

data/spec/sync_util_spec.rb

@@ -125,7 +125,7 @@ describe "table_lookup" do
 
   it "should return configured SN table" do
     table_map = util.table_lookup("sync/script_include/test_class.js")
-    expect(table_map.keys).to eq ["name", "table", "sysid", "field"]
+    expect(table_map.keys).to eq ["name", "table", "sys_id", "field"]
     expect(table_map["table"]).to eq "sys_script_include"
   end
 
@@ -137,20 +137,22 @@ describe "merge_update" do
     SnowSync::SyncUtil.new(opts = "test")
   end
 
-  it "should merge updated script with the configs object" do
+  it "should merge script with the configs object" do
     FileUtils.mkdir_p("sync")
     FileUtils.mkdir_p("sync/test_sub_dir")
-    json = { "property" => "value - with update" }
+    json_resp = "var test = 'test'; \n" +
+    "var testing = function(arg) { \n\tgs.print(arg) \n}; \n" +
+    "testing('test');"
     name = "TestClass".snakecase
     path = proc do
       FileUtils.cd("sync/test_sub_dir")
     end
-    util.create_file(name, json, &path)
+    util.create_file(name, json_resp, &path)
     FileUtils.cd("../..")
     file = "sync/test_sub_dir/test_class.js"
     table_map = util.table_lookup(file)
-    util.merge_update(file, table_map)
-    expect(util.configs["sys_script_include_response"] != nil).to eq true
+    util.merge_update(file, "script_include", table_map)
+    expect(util.configs["table_map"]["script_include"]["mod"] != nil).to eq true
   end
 
 end
@@ -163,7 +165,7 @@ describe "setup_sync_directories" do
   end
 
   it "should setup and synchronize field from the SN instance" do
-    util.setup_sync_directories
+    util.run_setup_and_sync
     file = File.open("sync/script_include/test_class.js")
     expect(file.is_a?(Object)).to eq true
     FileUtils.rm_rf("sync")
@@ -171,14 +173,14 @@ describe "setup_sync_directories" do
  
 end
 
-describe "push_modifications" do
+describe "push_modifications - single table configuration" do
 
   let! :util do
     SnowSync::SyncUtil.new(opts = "test")
   end
 
   it "should push modifications to a configured instance" do
-    util.setup_sync_directories
+    util.run_setup_and_sync
     file = File.open("sync/script_include/test_class.js", "r+")
     lines = file.readlines
     file.close
@@ -189,7 +191,7 @@ describe "push_modifications" do
     end
     newfile.close
     util.push_modifications(["sync/script_include/test_class.js"])
-    util.setup_sync_directories
+    util.run_setup_and_sync
     file = File.open("sync/script_include/test_class.js", "r+")
     lines = file.readlines
     file.close
@@ -197,3 +199,41 @@ describe "push_modifications" do
   end
 
 end
+
+describe "push_modifications - mutli-table configuration" do
+
+  let! :util do
+    SnowSync::SyncUtil.new(opts = "test")
+  end
+
+  it "should sync, update, queue, push, re-sync mods for a configured instance" do
+    def do_edit(file, edit)
+      file = File.open(file, "r+")
+      lines = file.readlines
+      file.close  
+      lines[0] = edit
+      newfile = File.new(file, "w")
+      lines.each do |line|
+        newfile.write(line)
+      end
+      newfile.close
+    end
+    def run_check(file, edit)
+      file = File.open(file, "r+")
+      lines = file.readlines
+      file.close
+      expect(lines[0]).to eq edit
+    end
+    util.run_setup_and_sync
+    # sys_script_include
+    do_edit("sync/script_include/test_class.js", "// test comment -\n")
+    # sys_ui_action
+    do_edit("sync/ui_action/test.js", "// test comment -\n")
+    # queued mods, push in sequence
+    util.push_modifications(["sync/script_include/test_class.js", "sync/ui_action/test.js"])
+    util.run_setup_and_sync
+    run_check("sync/script_include/test_class.js", "// test comment -\n")
+    run_check("sync/ui_action/test.js", "// test comment -\n")
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snow_sync
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 3.0.0
 platform: ruby
 authors:
 - Andy Wallace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-16 00:00:00.000000000 Z
+date: 2017-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler