nixenvironment 0.0.115 → 0.0.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecc63a6c11b82af7142dc8335e67d705a6e88373
-  data.tar.gz: 2cb0fab9a2f39f1aceea9dcd825a38a48b075360
+  metadata.gz: 771693cb4e195687daf104dd4a1f7ef6bb72a47f
+  data.tar.gz: 8624c207144ad6f482a7e72130b401ba5faa3683
 SHA512:
-  metadata.gz: 36a66925ba6d03a100a5115cc33c2304e52c23111759c7fddba990370339f3d05a75dced76887d8c0b96d2844370dbf84df1768bc2fa16db00576cda2e875ca0
-  data.tar.gz: 63a029e285af9663f6cf633a7e4ca94c65c27ad31bcbe11f44c5605f8956e5e5235523eb6917c28d9b61c996a3c5d4abbe1ba8f656186b8826645cb0ce0e3738
+  metadata.gz: be8e595ee7174cd8216f1f175fd77e490c76bdf2600f23691fb99f4c148419f84ddde72ad78eea490fce6cc3ec3a9ced2152b3d9690ddfe43da60821416fb857
+  data.tar.gz: ce78984dda66fa84d2bed8c923971933d8f36ce617a7128b694e28a15871557864af0c45b789c9b4b8f8344d7d8c01a5f3e253e9992a43494bdb83dd37e476a4

data/legacy/Deploy.sh

@@ -5,8 +5,8 @@
 
 # Script uploads IPA product. Creates appropriate subdirectories.
 
-if [[ $# < 5 ]]; then
-    echo "usage: $0 DEPLOY_HOST DEPLOY_DIR DEPLOY_USER DEPLOY_PASSWORD LOCAL_PATH_TO_BUILD"
+if [[ $# < 6 ]]; then
+    echo "usage: $0 DEPLOY_HOST DEPLOY_DIR DEPLOY_USER DEPLOY_PASSWORD LOCAL_PATH_TO_BUILD RELATIVE_PATH"
     exit 1
 fi
 
@@ -15,11 +15,11 @@ DEPLOY_DIR=$2
 DEPLOY_USER=$3
 DEPLOY_PASS=$4
 LOCAL_PATH_TO_BUILD=$5
-
-chmod -R 775 "${LOCAL_PATH_TO_BUILD}"
+RELATIVE_PATH=$6
 
 echo "Uploading build"
 
-scp -p -r "${LOCAL_PATH_TO_BUILD}" "${DEPLOY_USER}@${DEPLOY_HOST}:${DEPLOY_DIR}"
+scp -r "${LOCAL_PATH_TO_BUILD}" "${DEPLOY_USER}@${DEPLOY_HOST}:${DEPLOY_DIR}"
+ssh ${DEPLOY_USER}@${DEPLOY_HOST} "chmod 775 -R ${DEPLOY_DIR}/${RELATIVE_PATH}"
 
 rm -rf "${LOCAL_PATH_TO_BUILD}"

data/lib/nixenvironment/deployer.rb

@@ -105,8 +105,9 @@ module Nixenvironment
                              ipa_bundle_id, ipa_product, current_app_version, current_build_version, name_for_deployment, executable_name, app_dsym, sdk)
       is_iphone_build = sdk.include?('iphone')
 
+      relative_path           = "v.#{current_app_version}_#{current_build_version}"
       local_path_to_app       = File.join(Dir.tmpdir, ipa_bundle_id)
-      local_path_to_build     = File.join(local_path_to_app, "v.#{current_app_version}_#{current_build_version}")
+      local_path_to_build     = File.join(local_path_to_app, relative_path)
       configuration_full_path = File.join(local_path_to_build, name_for_deployment)
       destination_ipa_product = File.join(configuration_full_path, executable_name + (is_iphone_build ? IPA_EXT : ZIP_EXT))
 
@@ -141,16 +142,16 @@ module Nixenvironment
 
       FileUtils.chmod_R(0775, local_path_to_app)
 
-      scp(deploy_host, deploy_dir, deploy_user, deploy_password, local_path_to_app)
+      scp(deploy_host, deploy_dir, deploy_user, deploy_password, local_path_to_app, relative_path)
 
       FileUtils.rm_rf(local_path_to_app)
     end
 
-    def self.scp(deploy_host, deploy_dir, deploy_user, deploy_password, local_path_to_app)
+    def self.scp(deploy_host, deploy_dir, deploy_user, deploy_password, local_path_to_app, relative_path)
       puts
       puts "Uploading build from '#{local_path_to_app}' ...".blue
 
-      raise 'Deploy error!' unless system("#{DEPLOY_SCRIPT_PATH} '#{deploy_host}' '#{deploy_dir}' '#{deploy_user}' '#{deploy_password}' '#{local_path_to_app}'")
+      raise 'Deploy error!' unless system("#{DEPLOY_SCRIPT_PATH} '#{deploy_host}' '#{deploy_dir}' '#{deploy_user}' '#{deploy_password}' '#{local_path_to_app}' '#{relative_path}'")
 
       # TODO: Will use code below after fix https://github.com/net-ssh/net-scp/issues/24
       #

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.115'
+  VERSION = '0.0.116'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.115
+  version: 0.0.116
 platform: ruby
 authors:
 - Karen