zewo-dev 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7403c6b926202e7bc02eae2995f9cfe76e1b4e88
-  data.tar.gz: a1c384428305425517031772c7c37bc0095c1ab7
+  metadata.gz: ce2e8f7965bec2557174aea4f424d029c4f06f1e
+  data.tar.gz: ae678c512b08643a3995d3fd4a971e1c20293cfb
 SHA512:
-  metadata.gz: 3840e573f9d56bb2f8ac732dccbd84846f2ca337c9069ddddb9a8809765ce0b45c3aaeaa07d3e366dc20669255e3a1223d0b82465a0f3e5ee447eebd61f9c1a1
-  data.tar.gz: 99c9dac1da147e72d30ea426523378bf127274a6331abb5b1c6a5f20eb86cc7067d3999c3694133b9e02627a988de313c705f071e77b8d39864f61e5efce1d83
+  metadata.gz: 078cb097ada7fccbba4b24d89e71f1819fa8605b79b6911e52afd52f693357a510d012f652c4c3bf153584f77d88ccfcc5b2b74e768fb91aa47aa0acba098d7b
+  data.tar.gz: 205f0a1f4022773245dea55e09743d0c16976a4c310eba16671fcf494d4fa7506bbb9b22a9eed07ea494dfffb6f9a2f29bb7c46426651f600b44f587569fb4ed

data/README.md

@@ -21,6 +21,9 @@ zewodev init
 ```
 
 ## Xcode development
+
+> A new method has been implemented to simplify the setup process `zewodev setup_osx_dev`. This command removes the need to perform the steps below.
+
 Run `zewodev make_projects` to generate Xcode projects for all Swift modules. Every time this command is run, the previously generated projects are removed entirely. Xcode files should not be pushed. Add `XcodeDevelopment` to `.gitignore` if not there already.
 
 **Because the tool also adds modules as dependencies you can work on several repositories simultaneously.**

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "zewo"
+require 'bundler/setup'
+require 'zewo'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "zewo"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/bin/zewodev

@@ -1,8 +1,7 @@
-#!/usr/bin/env ruby -wU
+#!/usr/bin/env ruby -W0
 
 require 'zewo'
 
 $VERBOSE = nil
 
 Zewo::App.start(ARGV)
-

data/lib/zewo/version.rb

@@ -1,3 +1,3 @@
 module Zewo
-  VERSION = "0.2.9"
+  VERSION = "0.2.10".freeze
 end

data/lib/zewo.rb

@@ -1,7 +1,6 @@
 require 'zewo/version'
 
 require 'thor'
-require 'rubygems'
 require 'json'
 require 'net/http'
 require 'uri'
@@ -37,7 +36,6 @@ module Zewo
         if target_name == 'OS'
           target_name = 'OperatingSystem'
         end
-
         xcode_project.native_targets.find { |t| t.name == target_name } || xcode_project.new_target(:framework, target_name, :osx)
       end
 
@@ -53,11 +51,11 @@ module Zewo
       end
 
       def tests_dirname
-        "Tests"
+        'Tests'
       end
 
       def xcode_dirname
-        "XcodeDevelopment"
+        'XcodeDevelopment'
       end
 
       def xcode_project_path
@@ -65,22 +63,14 @@ module Zewo
       end
 
       def sources_dirname
-        if File.directory?(dir('Sources'))
-          return 'Sources'
-        elsif File.directory?(dir('Source'))
-          return 'Source'
-        end
-        nil
+        return 'Sources' if File.directory?(dir('Sources'))
+        return 'Source'  if File.directory?(dir('Source'))
       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
+        return Xcodeproj::Project.open(xcode_project_path) if File.exist?(xcode_project_path)
+        Xcodeproj::Project.new(xcode_project_path)
       end
 
       def add_files(direc, current_group, main_target)
@@ -102,22 +92,15 @@ module Zewo
       def build_dependencies
         puts "Configuring dependencies for #{name}".green
         dependency_repos = File.read(dir('Package.swift')).scan(/(?<=Zewo\/|SwiftX\/|VeniceX\/|paulofaria\/)(.*?)(?=\.git)/).map(&:first)
-
-        # here we should do something like dependency_repos -= ['CMySQL', 'COpenSSL', 'CLibpq']
-
         group = xcode_project.new_group('Subprojects')
         dependency_repos.each do |repo_name|
           next if repo_name.end_with?('-OSX')
 
           repo = Repo.new(repo_name)
-          project_reference = group.new_file("#{repo.xcode_project_path}")
+          project_reference = group.new_file(repo.xcode_project_path.to_s)
           project_reference.path = "../../#{project_reference.path}"
-
-          if framework_target
-            framework_target.add_dependency(repo.framework_target)
-          end
+          framework_target.add_dependency(repo.framework_target) if framework_target
         end
-
         xcode_project.save
       end
 
@@ -161,7 +144,7 @@ module Zewo
 
         xcode_project.save
 
-        scheme = Xcodeproj::XCScheme.new()
+        scheme = Xcodeproj::XCScheme.new
         scheme.configure_with_targets(framework_target, test_target)
         scheme.test_action.code_coverage_enabled = true
         scheme.save_as(xcode_project.path, framework_target.name, true)
@@ -176,12 +159,9 @@ module Zewo
         http.use_ssl = true
         request = Net::HTTP::Get.new(uri.request_uri)
 
-        blacklist = [
-          'ZeroMQ'
-        ]
+        blacklist = ['ZeroMQ']
 
         response = http.request(request)
-
         if response.code == '200'
           result = JSON.parse(response.body).sort_by { |hsh| hsh['name'] }
 
@@ -207,9 +187,7 @@ module Zewo
 
       def each_code_repo
         each_repo do |repo|
-          unless File.exist?(repo.dir('Package.swift'))
-            next
-          end
+          next unless File.exist?(repo.dir('Package.swift'))
           yield repo
         end
       end
@@ -227,7 +205,7 @@ module Zewo
       def verify_branches
         last_branch_name = nil
         each_repo do |repo|
-          branch_name = `cd #{repo.dir}; git rev-parse --abbrev-ref HEAD`.gsub("\n", '')
+          branch_name = `cd #{repo.dir}; git rev-parse --abbrev-ref HEAD`.delete("\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
@@ -240,11 +218,7 @@ module Zewo
       def prompt(question)
         printf "#{question} -  y/N: "
         p = STDIN.gets.chomp
-        if p == 'y'
-          true
-        else
-          false
-        end
+        p == 'y'
       end
 
       def uncommited_changes?(repo_name)
@@ -252,7 +226,7 @@ module Zewo
       end
 
       def master_branch?(repo_name)
-        name = `cd #{repo_name}; git rev-parse --abbrev-ref HEAD`
+        `cd #{repo_name}; git rev-parse --abbrev-ref HEAD`
       end
 
       def each_osx_whitelisted_repo
@@ -296,23 +270,18 @@ module Zewo
     def status
       each_code_repo do |repo|
         str = repo.name
-        if uncommited_changes?(repo.name)
-          str = str.red
-        else
-          str = str.green
-        end
-
+        str = uncommited_changes?(repo.name) ? str.red : str.green
         tag = `cd #{repo.name}; git describe --abbrev=0 --tags` || 'No tag'
         str += " (#{tag})"
-        puts str.gsub("\n", '')
+        puts str.delete("\n")
       end
     end
 
     desc :tag, 'Tags all code repositories with the given tag. Asks to confirm for each repository'
     def tag(tag)
       each_code_repo do |repo|
-        shouldTag = prompt("create tag #{tag} in #{repo.name}?")
-        if shouldTag
+        should_tag = prompt("create tag #{tag} in #{repo.name}?")
+        if should_tag
           silent_cmd("cd #{repo.name} && git tag #{tag}")
           puts repo.name.green
         end
@@ -322,7 +291,7 @@ module Zewo
     desc :checkout, 'Checks out all code repositories to the latest patch release for the given tag/branch'
     option :branch
     option :tag
-    def checkout()
+    def checkout
       if !options[:branch] && !options[:tag]
         puts 'Need to specify either --tag or --branch'.red
         return
@@ -330,18 +299,11 @@ module Zewo
 
       Dir['*/'].each do |folder_name|
         folder_name = folder_name[0...-1]
-        matched = nil
-
-        if options[:tag]
-          matched = `cd #{folder_name} && git tag`
-            .split("\n")
-            .select { |t| t.start_with?(options[:tag]) }
-            .last
-        end
-
-        if options[:branch]
-          matched = options[:branch]
-        end
+        matched = `cd #{repo.name} && git tag`
+                  .split("\n")
+                  .select { |t| t.start_with?(options[:tag]) }
+                  .last if options[:tag]
+        matched = options[:branch] if options[:branch]
 
         if matched
           silent_cmd("cd #{folder_name} && git checkout #{matched}")
@@ -354,7 +316,7 @@ module Zewo
 
     desc :pull, 'git pull on all repos'
     def pull
-      print "Updating all repositories..." + "\n"
+      print "Updating all repositories...\n"
       each_code_repo_async do |repo|
         if uncommited_changes?(repo.name)
           print "Uncommitted changes in #{repo.name}. Not updating.".red + "\n"
@@ -368,7 +330,6 @@ module Zewo
     desc :make_projects, 'Makes Xcode projects for all modules'
     def make_projects
       each_code_repo(&:configure_xcode_project)
-
       each_code_repo(&:build_dependencies)
     end
 

data/zewo.gemspec

@@ -4,27 +4,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'zewo/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "zewo-dev"
+  spec.name          = 'zewo-dev'
   spec.version       = Zewo::VERSION
-  spec.authors       = ["David Ask"]
-  spec.email         = ["david@formbound.com"]
+  spec.authors       = ['David Ask']
+  spec.email         = ['david@formbound.com']
 
-  spec.summary       = %q{Summary}
-  spec.description   = %q{Description}
-  spec.homepage      = "http://github.com/Zewo"
-  spec.license       = "MIT"
+  spec.summary       = 'zewo-dev is a tool to make developing Zewo modules and tracking their status easier.'
+  spec.description   = 'Developer tool for contributing to Zewo'
+  spec.homepage      = 'http://github.com/Zewo'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "xcodeproj", "~> 0.28"
-  spec.add_dependency "thor", "~> 0.19"
-  spec.add_dependency "xcpretty", "~> 0.2"
-  spec.add_dependency "colorize"
-  
-  
+  spec.add_runtime_dependency 'xcodeproj', '~> 0.28.2'
+  spec.add_runtime_dependency 'thor', '~> 0.19'
+  spec.add_runtime_dependency 'xcpretty', '~> 0.2'
+  spec.add_runtime_dependency 'colorize', '~> 0'
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'rake', '~> 10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zewo-dev
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - David Ask
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: 0.28.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +56,14 @@ dependencies:
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -94,7 +94,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Description
+description: Developer tool for contributing to Zewo
 email:
 - david@formbound.com
 executables:
@@ -137,8 +137,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Summary
+summary: zewo-dev is a tool to make developing Zewo modules and tracking their status
+  easier.
 test_files: []