zewo-dev 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c44e142dac8ba152c983e0af01c2b666762beaf1
-  data.tar.gz: 9eb785b29a27335363d8bf9b0629c40a4ca6bbac
+  metadata.gz: b3d02c82f775cdbabc993627c1d1bf48f1873eaf
+  data.tar.gz: 42abaab6c40f194d92c6e79b7ba79dbe71933654
 SHA512:
-  metadata.gz: f8d280d746810ffe639d9dc4bdc64308677d4faa59de4a76aa795fc0467958a9d854e928545d4b1d56fba68e69fa0fbc3ca26050bdfd9b054c82a237f2177b69
-  data.tar.gz: 6e7600763780ecda4420e8047a9d45e734fca4ab62fde6ffaf7e759f1e3a201f8c2856e189b70514a46ee893b1d7cc408f64d24ec5b3dd2bdfebe0dbd1451e85
+  metadata.gz: 02aafd101f9a033d4fccb8908b0d2f54c8e8dfe299fa4b4ddbc7c580e6a640ec9a5407a5a20d663ad01dac95d2d74102d4bbeefd847dc0e431e47eaf02c1883e
+  data.tar.gz: d0e53a47dc369b03ccecf831a6ae38cbb7c20cf703ab6c39e15de1cc39196c4f5517744d7ec06588ffb235ea0d52e1dfbe2ff0109fa06677bc7c37a13d2a2148

data/README.md

@@ -35,4 +35,7 @@ Run `zewodev make_projects` to generate Xcode projects for all Swift modules. Ev
 Lastly, you'll be prompted to push your changes.
 
 ## Push & pull
-`zewodev push` and `zewodev pull` will push and pull changes for all Swift modules.
+`zewodev push` and `zewodev pull` will push and pull changes for all Swift modules.
+
+## Unit testing
+If you create a folder called `Tests` in the same directory as your `Sources` directory, the tool will create a `<ModuleName>-tests` target and add the test files to that target.

data/lib/zewo/version.rb

@@ -1,3 +1,3 @@
 module Zewo
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/lib/zewo.rb

@@ -41,16 +41,31 @@ module Zewo
         xcode_project.native_targets.find { |t| t.name == target_name } || xcode_project.new_target(:bundle, target_name, :osx)
       end
 
-      def tests_dir
+      def dir(ext = nil)
+        r = name
+        r = "#{r}/#{ext}" if ext
+        r
+      end
+
+      def tests_dirname
         "Tests"
       end
 
-      def xcode_dir
-        "#{name}/XcodeDevelopment"
+      def xcode_dirname
+        "XcodeDevelopment"
       end
 
       def xcode_project_path
-        "#{xcode_dir}/#{name}.xcodeproj"
+        dir("#{xcode_dirname}/#{name}.xcodeproj")
+      end
+
+      def sources_dirname
+        if File.directory?(dir('Sources'))
+          return 'Sources'
+        elsif File.directory?(dir('Source'))
+          return 'Source'
+        end
+        nil
       end
 
       def xcode_project
@@ -63,15 +78,6 @@ module Zewo
         @xcodeproj
       end
 
-      def sources_dir
-        if File.directory?("#{name}/Sources")
-          return 'Sources'
-        elsif File.directory?("#{name}/Source")
-          return 'Source'
-        end
-        nil
-      end
-
       def add_files(direc, current_group, main_target)
         Dir.glob(direc) do |item|
           next if item == '.' || item == '.DS_Store'
@@ -90,7 +96,7 @@ module Zewo
 
       def build_dependencies
         puts "Configuring dependencies for #{name}".green
-        dependency_repos = File.read("#{name}/Package.swift").scan(/(?<=Zewo\/)(.*?)(?=\.git)/).map(&:first)
+        dependency_repos = File.read(dir('Package.swift')).scan(/(?<=Zewo\/)(.*?)(?=\.git)/).map(&:first)
 
         group = xcode_project.new_group('Subprojects')
         dependency_repos.each do |repo_name|
@@ -108,32 +114,45 @@ module Zewo
 
       def configure_xcode_project
         @xcodeproj = nil
-        silent_cmd("rm -rf #{xcode_dir}")
+        silent_cmd("rm -rf #{dir(xcode_dirname)}")
 
         puts "Creating Xcode project #{name}".green
 
         framework_target.build_configurations.each do |configuration|
           framework_target.build_settings(configuration.name)['HEADER_SEARCH_PATHS'] = '/usr/local/include'
           framework_target.build_settings(configuration.name)['LIBRARY_SEARCH_PATHS'] = '/usr/local/lib'
+          framework_target.build_settings(configuration.name)['ENABLE_TESTABILITY'] = 'YES'
 
-          if File.exist?("#{name}/module.modulemap")
+          if File.exist?(dir('module.modulemap'))
             framework_target.build_settings(configuration.name)['MODULEMAP_FILE'] = '../module.modulemap'
           end
         end
 
-        xcode_project.new_file('../module.modulemap') if File.exist?("#{name}/module.modulemap")
+        framework_target.frameworks_build_phase.clear
 
-        if sources_dir
-          group = xcode_project.new_group(sources_dir)
-          add_files("#{name}/#{sources_dir}/*", group, framework_target)
+        xcode_project.new_file('../module.modulemap') if File.exist?(dir('module.modulemap'))
+
+        if sources_dirname
+          group = xcode_project.new_group(sources_dirname)
+          add_files(dir("#{sources_dirname}/*"), group, framework_target)
         end
 
-        if File.directory?("#{name}/#{tests_dir}")
-          group = xcode_project.new_group(tests_dir)
-          add_files("#{name}/#{tests_dir}/*", group, test_target)
+        test_target.resources_build_phase
+        test_target.add_dependency(framework_target)
+
+        test_target.build_configurations.each do |configuration|
+          test_target.build_settings(configuration.name)['WRAPPER_EXTENSION'] = 'xctest'
+          test_target.build_settings(configuration.name)['LD_RUNPATH_SEARCH_PATHS'] = '$(inherited) @executable_path/../../Frameworks @loader_path/../Frameworks'
         end
 
+        group = xcode_project.new_group(tests_dirname)
+        add_files(dir("#{tests_dirname}/*"), group, test_target)
+
         xcode_project.save
+
+        scheme = Xcodeproj::XCScheme.new()
+        scheme.configure_with_targets(framework_target, test_target)
+        scheme.save_as(xcode_project.path, framework_target.name, true)
       end
     end
 
@@ -149,15 +168,12 @@ module Zewo
           'Core',
           'GrandCentralDispatch',
           'JSONParserMiddleware',
-          'Levee',
           'LoggerMiddleware',
           'Middleware',
-          'Mustache',
-          'POSIXRegex',
           'SSL',
-          'Sideburns',
           'SwiftZMQ',
-          'WebSocket'
+          'WebSocket',
+          'HTTPMiddleware'
         ]
 
         response = http.request(request)
@@ -165,14 +181,13 @@ module Zewo
         if response.code == '200'
           result = JSON.parse(response.body).sort_by { |hsh| hsh['name'] }
 
-
           result.each do |doc|
             next if blacklist.include?(doc['name'])
             repo = Repo.new(doc['name'], doc)
             yield repo
           end
         else
-          puts 'Error loading repositories'
+          puts 'Error loading repositories'.red
         end
       end
 
@@ -188,8 +203,7 @@ module Zewo
 
       def each_code_repo
         each_repo do |repo|
-          unless File.exist?("#{repo.name}/Package.swift")
-            print "No Package.swift for #{repo.name}. Skipping." + "\n"
+          unless File.exist?(repo.dir('Package.swift'))
             next
           end
           yield repo
@@ -209,7 +223,7 @@ module Zewo
       def verify_branches
         last_branch_name = nil
         each_repo do |repo|
-          branch_name = `cd #{repo.name}; git rev-parse --abbrev-ref HEAD`.gsub("\n", '')
+          branch_name = `cd #{repo.dir}; git rev-parse --abbrev-ref HEAD`.gsub("\n", '')
           if !last_branch_name.nil? && branch_name != last_branch_name
             puts "Branch mismatch. Branch of #{repo.name} does not match previous branch #{branch_name}".red
             return false
@@ -257,15 +271,15 @@ module Zewo
 
     desc :pull, 'git pull on all repos'
     def pull
+      print "Updating all repositories..." + "\n"
       each_code_repo_async do |repo|
-        print "Updating #{repo.name}..." + "\n"
         if uncommited_changes?(repo.name)
           print "Uncommitted changes in #{repo.name}. Not updating.".red + "\n"
           next
         end
         system("cd #{repo.name}; git pull")
-        print "Updated #{repo.name}".green + "\n"
       end
+      puts 'Done!'
     end
 
     desc :push, 'git push on all repos'
@@ -289,7 +303,7 @@ module Zewo
         print "Checking #{repo.name}..." + "\n"
         unless File.directory?(repo.name)
           print "Cloning #{repo.name}...".green + "\n"
-          silent_cmd("git clone #{repo.data['ssh_url']}")
+          silent_cmd("git clone #{repo.data['clone_url']}")
         end
       end
       puts 'Done!'
@@ -298,14 +312,14 @@ module Zewo
     desc :build, 'Clones all Zewo repositories'
     def build
       each_code_repo do |repo|
-        unless File.directory?("#{repo.name}/Xcode")
+        unless File.directory?(repo.dir(repo.xcode_dirname))
           puts "Skipping #{repo.name}. No Xcode project".yellow
         end
         puts "Building #{repo.name}...".green
 
-        if system("cd #{repo.name}/Xcode; set -o pipefail && xcodebuild -scheme \"#{repo.name}\" -sdk \"macosx\" -toolchain /Library/Developer/Toolchains/swift-latest.xctoolchain | xcpretty") == false
+        if system("cd #{repo.dir(repo.xcode_dirname)}; set -o pipefail && xcodebuild -scheme \"#{repo.framework_target.name}\" -sdk \"macosx\" -toolchain \"/Library/Developer/Toolchains/swift-latest.xctoolchain\" | xcpretty") == false
           puts "Error building. Maybe you're using the wrong Xcode? Try `sudo xcode-select -s /Applications/Xcode-Beta.app/Contents/Developer` if you have a beta-version of Xcode installed.".red
-
+          return
         end
       end
     end
@@ -319,14 +333,13 @@ module Zewo
         puts repo.name
         puts '--------------------------------------------------------------'
         if uncommited_changes?(repo.name)
-          puts 'Status:'.yellow
-          system("cd #{repo.name}; git status")
+          system("cd #{repo.dir}; git status")
           return unless prompt("Proceed with #{repo.name}?")
         end
       end
 
       each_code_repo do |repo|
-        system("cd #{repo.name}; git add --all; git commit -am \"#{message}\"")
+        system("cd #{repo.dir}; git add --all; git commit -am \"#{message}\"")
         puts "Commited #{repo.name}\n".green
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zewo-dev
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - David Ask