SurfCustomCalabash 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10324a3851f0d2c8a774575861c3489d6519d9a6fed70ac48244565ed9c03da6
-  data.tar.gz: 70572d7c07b601e2407cc9cf8e0d3317a680b919afb56faca9be2d3cb9f68f04
+  metadata.gz: 642a2175dd5be63af09865c3e401256600b92e24e9d81b7acebb6a3431356c5f
+  data.tar.gz: cb0842d72f0a04b435f422b928869cbaa84aca0a14db4ea028e4c07d88b9bfb2
 SHA512:
-  metadata.gz: 4092df2ff8c18a451ad3e0132accbb3eae2c66ee24526e43d7c0adfa51f17e47234f8573999d248df0de0eb24a91f264fed8cd1310a8784309e44eb5776bdc57
-  data.tar.gz: 89d7c2269fd6aa04b72eb58ace406dad941a2dcaf2ae84559729802ff1ea65e65e39db5d1902577e70df131b35f5e4e13f8abdebfe3b2054e798caa336eac22d
+  metadata.gz: adfc4a77d09b27c5b2abd6094a49981763d9cd4dae2c033fd6602936d9ba3953e260424665511ed61b1b4dd152674c898ebea1bfb262ee45583797c39bfab31c
+  data.tar.gz: 35c47618c702ccc856c0bc5dcfe8e5a8ffaaf259609dd6e8ff758dde008f33a116814c91bab2ea2e6db8dc6fdd0bcf8018d0f5d34d111844f810e557e8e257d6

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## v1.1.0 - 08.10.2020
+### Added
+- File **files_for_update** with a list of files required for updating in your project with autotests. For update your project use **SurfCustomCalabash update**
+
+### Changed
+- In command **SurfCustomCalabash gen** you can immediately enter the name of the folder with your tests
+
 
 ## v1.0.0 - 28.08.2020
 ### Added

data/Gemfile

@@ -6,4 +6,5 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 gem 'calabash-android'
-gem 'rspec/expectations'
+gem 'rspec/expectations'
+gem 'diffy'

data/README.md

@@ -34,8 +34,7 @@ Install gem in your exist project, add in your ios or android ruby files.
 **CommonMethods** contains different methods (taps, swipes, waits and other) for both platforms.
 
 ### Create new project
-You should move to the directory which would contains folder with your tests. 
-surf-calabash will create it by itself with the name **Change_it_to_your_own_project_name**: 
+You should move to the directory which would contains folder with your tests and execute command and then enter folder name 
     
     $ SurfCustomCalabash gen
     
@@ -92,4 +91,10 @@ Also it shows some integration with Xray Jira plugin.
 
 Shell script for useful launch all helpful scripts of folder above.
 
- 
+### Update infrastructure files
+
+To check the relevance of the infrastructure files of your project with autotests, execute command:
+
+    $ SurfCustomCalabash update
+
+If your project has files that are not up-to-date, you will be prompted to update them all or only those you need.

data/bin/SurfCustomCalabash

@@ -12,9 +12,10 @@ end
 
 require File.join(File.dirname(__FILE__), "surf-calabash-helpers")
 
-@hierarchy = File.join(FileUtils.pwd, "Change_it_to_your_own_project_name")
+@hierarchy = File.join(FileUtils.pwd, "features")
 @source_dir = File.join(File.dirname(__FILE__), '..', 'sources')
 
+
 if ARGV.length == 0
   print_usage
 else
@@ -47,6 +48,14 @@ else
     when 'version'
       require_relative '../lib/SurfCustomCalabash/version'
       Kernel.puts SurfCustomCalabash::VERSION
+    when 'update'
+      require File.join(File.dirname(__FILE__), "update_files")
+      if File.exists?(@hierarchy)
+        show_files_for_update
+      else
+        Kernel.puts("В текущей папке нет файлов автотестов, перейдите в нужную папку или создайте новый проект используя команду:")
+        Kernel.puts("SurfCustomCalabash gen")
+      end
     else
       Kernel.puts "Invalid command '#{cmd}'"
       print_usage

data/bin/files_for_update

@@ -0,0 +1,7 @@
+/sources/features/android/support
+/sources/features/ios/support
+/sources/features/net/screentest_api.rb
+/sources/Scripts
+/sources/find_id.rb
+/sources/group_steps.rb
+/sources/start.sh

data/bin/surf-calabash-gen.rb

@@ -5,12 +5,14 @@ def surf_gen
   end
   msg("Question") do
     Kernel.puts "I'm about to create a subdirectory called sources."
-    Kernel.puts "Please change name of it to name of your own project."
     Kernel.puts "Please hit return to confirm that's what you want."
   end
   exit 2 unless STDIN.gets.chomp == ''
 
-  FileUtils.cp_r(@source_dir, @hierarchy)
+  Kernel.puts("Please enter name autotest project:")
+  file_name = gets.chomp
+  file_name = "Change_it_to_your_own_project_name" if file_name == ""
+  FileUtils.cp_r(@source_dir, File.join(FileUtils.pwd, file_name))
   msg("Info") do
       Kernel.puts "hierarchy was created. \n"
   end

data/bin/surf-calabash-helpers.rb

@@ -16,6 +16,8 @@ def print_usage
       prints more detailed help information.
     gen
       generate a features folder structure.
+    update
+      update infrastructure files in your project
     version
       prints the gem version
 

data/bin/update_files.rb

@@ -0,0 +1,202 @@
+require 'fileutils'
+require 'diffy'
+
+# for compare files use gem diffy https://github.com/samg/diffy
+
+CUR_FOLDER = FileUtils.pwd
+
+GEM_FOLDER = File.dirname(__FILE__)
+
+# list files for update
+FILES_FOR_UPDATE = File.join(GEM_FOLDER, 'files_for_update')
+
+# path to data file
+DATA_FILE = "/Scripts/data"
+
+# read from file, files that need update
+def read_file_to_arr(path_to_file)
+  arr_lines = Array.new
+  text = File.open(path_to_file).read
+  text.each_line do |line|
+    line.gsub!(/\n/, "")
+    arr_lines.push(line)
+  end
+  return arr_lines
+end
+
+# get list files from sourcec folder in gem
+def get_list_files_for_update
+  list_files = read_file_to_arr(FILES_FOR_UPDATE)
+  all_files = Array.new
+
+  list_files.each do |name|
+    path = File.join(GEM_FOLDER, '..', name)
+    if File.file?(path)
+      all_files.push(path)
+    elsif File.directory?(path)
+      Dir["#{path}/*"].each {|pth| all_files.push(pth)}
+    end
+  end
+
+  return all_files
+end
+
+# trim folder sources from path
+def get_list_for_search
+  all_files = get_list_files_for_update
+
+  all_files.each do |name|
+    name.sub! /.*sources/, ''
+  end
+
+  return all_files
+end
+
+# search files, then not exist in autotest folder
+def search_not_exists_files
+  not_exists_files = Array.new
+  get_list_for_search.each do |name|
+    not_exists_files.push(name) unless File.file?(CUR_FOLDER + name)
+  end
+
+  return not_exists_files
+end
+
+# search files, then exist in autotest folder
+def search_exists_files
+  exists_files = Array.new
+  get_list_for_search.each do |name|
+    exists_files.push(name) if File.file?(CUR_FOLDER + name)
+  end
+
+  # exclude file data from list, then to don't erase user data
+  exclude_str_from_arr(exists_files, DATA_FILE)
+  return exists_files
+end
+
+# copy files from gem to autotest folder
+def copy_files(list_for_copy)
+  list_for_copy.each do |name|
+    FileUtils.mkdir_p File.dirname(CUR_FOLDER + name)
+    FileUtils.cp(File.join(GEM_FOLDER, '../sources', name), File.dirname(CUR_FOLDER + name))
+  end
+end
+
+# add ccs style in html-report for readability
+def add_css_style(file)
+  file.puts("<style>")
+  file.puts(Diffy::CSS)
+  file.puts("</style>")
+end
+
+# compare files from gem and autotest folder
+# the result would be html file with differences in compare folder
+def compare_files
+  need_copy = Array.new
+  FileUtils.rm_rf(Dir[File.join(CUR_FOLDER, '/compare/*')])
+  search_exists_files.each do |name|
+    compare_result = Diffy::Diff.new(File.dirname(CUR_FOLDER + name), File.join(GEM_FOLDER, '../sources', name), :source => 'files', :format => :html)
+    unless compare_result.to_s(:text).empty?
+      need_copy.push(name)
+      FileUtils.mkdir_p 'compare'
+      File.open(File.join(CUR_FOLDER, '/compare/', "#{File.basename(name, ".*")}.html"), "w:UTF-8") do |file|
+        add_css_style(file)
+        file.puts(compare_result.to_s(:html))
+      end
+    end
+  end
+
+  return need_copy
+end
+
+# delete from array element match str_name
+def exclude_str_from_arr(input_arr, str_name)
+  result_arr = input_arr
+  need_del = result_arr.select { |el| el.include? str_name}
+  need_del.each do |value|
+    result_arr.delete(value)
+  end
+end
+
+# show files, then don't exixst in autotest folder
+def show_files_ready_for_copy
+  unless search_not_exists_files.empty?
+    Kernel.puts("Файлы которых нет в текущей папке с автотестами и они будут добавлены:")
+    Kernel.puts search_not_exists_files
+    Kernel.puts("\n")
+  end
+end
+
+# exclude files from list, then don't need update
+def excludes_files_for_update(input_arr, list_files)
+  all_files = list_files.split(/,\s*/)
+  list_files_for_update = input_arr
+  all_files.each do |name|
+    exclude_str_from_arr(list_files_for_update, name)
+  end
+
+  return list_files_for_update
+end
+
+# show files, then need update and update them
+def show_files_for_update
+  Kernel.puts("\n")
+
+  new_files = search_not_exists_files
+  exist_files = compare_files
+
+  if !new_files.empty? && exist_files.empty?
+    show_files_ready_for_copy
+    Kernel.puts("Скопировать все файлы? (y/n)")
+    answer = gets
+
+    if answer == "y\n"|| answer == "\n"
+      copy_files(new_files)
+      Kernel.puts("Файлы успешно добавлены!")
+    end
+  elsif !exist_files.empty?
+    show_files_ready_for_copy
+    Kernel.puts("Файлы которые уже есть в текущей папки с автотестами, но требуют обновления:")
+    Kernel.puts exist_files
+    Kernel.puts("\n")
+    Kernel.puts("Все изменения в указанных файлах можно посмотреть в папке compare")
+    Kernel.puts("Для каждого файла создан html-отчет с отображением изменений")
+    Kernel.puts("\n")
+    Kernel.puts("Скопировать все файлы или исключить некоторые файлы из обновления?")
+    Kernel.puts("1 - Скопировать все файлы")
+    Kernel.puts("2 - Исключить файлы из обновления")
+    answer = gets.chomp
+
+    if answer == "1"
+      copy_files(new_files)
+      copy_files(exist_files)
+      Kernel.puts("Файлы успешно добавлены!")
+    elsif answer == "2"
+      Kernel.puts("Введите в одной строке через запятую имена файлов, которые надо исключить из обновления:")
+      file_names = gets.chomp
+      files_for_update = excludes_files_for_update(exist_files,file_names)
+
+      if !files_for_update.empty? || !new_files.empty?
+        Kernel.puts("Список файлов для обновления:")
+        Kernel.puts files_for_update
+        Kernel.puts new_files
+        Kernel.puts("Скопировать все файлы? (y/n)")
+        answer = gets
+
+        if answer == "y\n"|| answer == "\n"
+          copy_files(new_files)
+          copy_files(files_for_update)
+          Kernel.puts("Файлы успешно добавлены!")
+        end
+      else
+        Kernel.puts("Нет файлов для обновлений!")
+      end
+    end
+  end
+
+  if new_files.empty? && compare_files.empty?
+    Kernel.puts("В текущей папке все инфраструктурные файлы актуальны!")
+  end
+
+  Kernel.puts("\n")
+end

data/lib/SurfCustomCalabash/version.rb

@@ -1,3 +1,3 @@
 module SurfCustomCalabash
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: SurfCustomCalabash
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexey Hripunov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,9 +71,11 @@ files:
 - Rakefile
 - SurfCustomCalabash.gemspec
 - bin/SurfCustomCalabash
+- bin/files_for_update
 - bin/surf-calabash-console.rb
 - bin/surf-calabash-gen.rb
 - bin/surf-calabash-helpers.rb
+- bin/update_files.rb
 - lib/SurfCustomCalabash.rb
 - lib/SurfCustomCalabash/CommonMethods.rb
 - lib/SurfCustomCalabash/DroidMethods.rb