zewo-dev 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5234c1d1c33a8b95ff7c980c45f74b8342774b3c
-  data.tar.gz: 3adcd3785024aa96a4648124f500f2e3ce96ce9e
+  metadata.gz: 3673c4a0a82ab3e0b7ba26200dc9eca647b941fc
+  data.tar.gz: 344a5d2eae09e3bfb08603ef9f72e4b91cfc5fc7
 SHA512:
-  metadata.gz: 3b853e4e4f94617aa3171bfbd0cb057ff3e0cbec7af0d5b1c449ace21a255e704154b0a43b73761406271ee4429f4073ba3030efcb8ac945730f85daf4dc8301
-  data.tar.gz: e64f4c9ccca7ed95f297a8ac239954df6eb80a904663a5541fd62c0b6b19a71d21b5122a66c5203edede1e728cbd71a921b5617dd981633c6c9077c8e7314064
+  metadata.gz: fa29300400d55b66493e9bb55e4f5e23dc6dbc5aced2003a490a67cee0f4cabe6968c5b0d050c9d813cd8a65c1ad237e5884f472e243d2fd9388ea36dd1232c1
+  data.tar.gz: d0a4f3e869c1edccdef1c723280a7b6d798ace07f2bbcac97e05335c2a0cef37b76e639c95594eeacdd51a25072636c7b762a762bcf0b3023409b2d228323391

data/lib/zewo/version.rb

@@ -1,3 +1,3 @@
 module Zewo
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/lib/zewo.rb

@@ -1,4 +1,4 @@
-require "zewo/version"
+require 'zewo/version'
 
 require 'thor'
 require 'rubygems'
@@ -12,19 +12,115 @@ require 'colorize'
 require 'thread'
 require 'thwait'
 
+def silent_cmd(cmd)
+  system("#{cmd} > /dev/null 2>&1")
+end
+
 module Zewo
   class App < Thor
-
     class Repo
       attr_reader :name
       @name = nil
       attr_reader :data
       @data = nil
 
-      def initialize(name, data)
+      @xcodeproj = nil
+
+      def initialize(name, data = nil)
         @name = name
         @data = data
       end
+
+      def framework_target
+        target_name = name.gsub('-OSX', '').gsub('-', '_')
+        xcode_project.native_targets.find { |t| t.name == target_name } || xcode_project.new_target(:framework, target_name, :osx)
+      end
+
+      def xcode_dir
+        "#{name}/XcodeTest"
+      end
+
+      def xcode_project_path
+        "#{xcode_dir}/#{name}.xcodeproj"
+      end
+
+      def xcode_project
+        return @xcodeproj if @xcodeproj
+        if File.exist?(xcode_project_path)
+          @xcodeproj = Xcodeproj::Project.open(xcode_project_path)
+        else
+          @xcodeproj = Xcodeproj::Project.new(xcode_project_path)
+        end
+        @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'
+
+          if File.directory?(item)
+            new_folder = File.basename(item)
+            created_group = current_group.new_group(new_folder)
+            add_files("#{item}/*", created_group, main_target)
+          else
+            item = item.split('/')[1..-1].unshift('..') * '/'
+            i = current_group.new_file(item)
+            main_target.add_file_references([i]) if item.include? '.swift'
+          end
+        end
+      end
+
+      def build_dependencies
+        puts "Configuring dependencies for #{name}".green
+        dependency_repos = File.read("#{name}/Package.swift").scan(/(?<=Zewo\/)(.*?)(?=\.git)/).map(&:first)
+
+        group = xcode_project.new_group('Subprojects')
+        dependency_repos.each do |repo_name|
+          repo = Repo.new(repo_name)
+          project_reference = group.new_file("#{repo.xcode_project_path}")
+          project_reference.path = "../../#{project_reference.path}"
+
+          if framework_target
+            framework_target.add_dependency(repo.framework_target)
+          end
+        end
+
+        xcode_project.save
+      end
+
+      def configure_xcode_project
+        @xcodeproj = nil
+        silent_cmd("rm -rf #{xcode_dir}")
+
+        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'
+
+          if File.exist?("#{name}/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")
+
+        if sources_dir
+          group = xcode_project.new_group(sources_dir)
+          add_files("#{name}/#{sources_dir}/*", group, framework_target)
+        end
+
+        xcode_project.save
+      end
     end
 
     no_commands do
@@ -35,15 +131,32 @@ module Zewo
         http.use_ssl = true
         request = Net::HTTP::Get.new(uri.request_uri)
 
+        blacklist = [
+          'Core',
+          'GrandCentralDispatch',
+          'JSONParserMiddleware',
+          'Levee',
+          'LoggerMiddleware',
+          'Middleware',
+          'Mustache',
+          'POSIXRegex',
+          'SSL',
+          'Sideburns',
+          'SwiftZMQ',
+          'WebSocket'
+        ]
+
         response = http.request(request)
 
         if response.code == '200'
-        result = JSON.parse(response.body).sort_by { |hsh| hsh['name'] }
-        
-        result.each do |doc|
-          repo = Repo.new(doc['name'], doc)
-          yield repo
-        end
+          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'
         end
@@ -52,9 +165,29 @@ module Zewo
       def each_repo_async
         threads = []
         each_repo do |repo|
-          threads << Thread.new {
+          threads << Thread.new do
+            yield(repo)
+          end
+        end
+        ThreadsWait.all_waits(*threads)
+      end
+
+      def each_code_repo
+        each_repo do |repo|
+          unless File.exist?("#{repo.name}/Package.swift")
+            print "No Package.swift for #{repo.name}. Skipping." + "\n"
+            next
+          end
+          yield repo
+        end
+      end
+
+      def each_code_repo_async
+        threads = []
+        each_code_repo do |repo|
+          threads << Thread.new do
             yield(repo)
-          }
+          end
         end
         ThreadsWait.all_waits(*threads)
       end
@@ -62,7 +195,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.name}; 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
@@ -110,17 +243,15 @@ module Zewo
 
     desc :pull, 'git pull on all repos'
     def pull
-      
       each_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 > /dev/null 2>&1")
+        silent_cmd("cd #{repo.name}; git pull")
         print "Updated #{repo.name}".green + "\n"
       end
-      
     end
 
     desc :push, 'git push on all repos'
@@ -133,7 +264,7 @@ module Zewo
           next
         end
         print "Pushing #{repo.name}...".green + "\n"
-        system("cd #{repo.name}; git push > /dev/null 2>&1")
+        silent_cmd("cd #{repo.name}; git push")
       end
       print 'Done!' + "\n"
     end
@@ -141,15 +272,15 @@ module Zewo
     desc :init, 'Clones all Zewo repositories'
     def init
       each_repo_async do |repo|
+        print "Checking #{repo.name}..." + "\n"
         unless File.directory?(repo.name)
           print "Cloning #{repo.name}...".green + "\n"
-          system("git clone #{repo.data['ssh_url']} > /dev/null 2>&1")
+          silent_cmd("git clone #{repo.data['ssh_url']}")
         end
       end
       puts 'Done!'
     end
 
-
     desc :build, 'Clones all Zewo repositories'
     def build
       each_repo do |repo|
@@ -160,7 +291,7 @@ module Zewo
 
         if system("cd #{repo.name}/Xcode; set -o pipefail && xcodebuild -scheme \"#{repo.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
-          
+
         end
       end
     end
@@ -181,13 +312,18 @@ module Zewo
 
         system("cd #{repo.name}; git add --all; git commit -am #{message}")
         puts "Commited #{repo.name}\n".green
-        
       end
       if prompt('Pull & push changes?'.red)
-        self.pull
-        self.push
+        pull
+        push
       end
-      
+    end
+
+    desc :make_projects, 'Makes projects'
+    def make_projects
+      each_code_repo(&:configure_xcode_project)
+
+      each_code_repo(&:build_dependencies)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zewo-dev
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - David Ask
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -100,7 +100,7 @@ email:
 executables:
 - console
 - setup
-- zewo
+- zewodev
 extensions: []
 extra_rdoc_files: []
 files:
@@ -112,7 +112,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- bin/zewo
+- bin/zewodev
 - lib/zewo.rb
 - lib/zewo/version.rb
 - zewo.gemspec