framework-generate 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a1f81cf334acb873df9c312586d80bc5e6d2461
-  data.tar.gz: c1e95eab5f0b18ced214c7cf8d24dbaea778a1a1
+  metadata.gz: 3352d76542ce29f95a8bb5a5f8fe901d95437551
+  data.tar.gz: '08b648f80dad19a6d78bc8175b169d566e26f98a'
 SHA512:
-  metadata.gz: 7c0e028ce6f3ebd0fa9feca17391a40731f29e175fcd7b2db52f8f26b1b0ad9947b884cefb81c89dee8552967101977c7902ddc1d75a14d04fad94665ad5d3da
-  data.tar.gz: b6471b8e21ffb0f457883bb3320591eacd663a4aab2a1d52e5378b3ac9526b512b4a30e175575a1d62a08fbac0b7ccaa3b6dc7d70009430610189d98c493e1c8
+  metadata.gz: e6e0333bedeea1689a55d1be0cd460b9e32b0ce265f8a09a4d13fe33319d929429b4b8a0b290386fdb437a1105a27a85f37bc89568aa4252c270cd9ba557bc33
+  data.tar.gz: fa17ccdc4bbb3e3efeaae96702ad2e202bb04c05be803f6ac5995ac7fbadb041d19134d22b892fa87699f33d669d3b8d55630e63e918dda92d42372420dfcf7e

data/README.md

@@ -1,4 +1,7 @@
 # framework-generate
+[![Gem Version](https://badge.fury.io/rb/framework-generate.svg)](https://badge.fury.io/rb/framework-generate)
+[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](LICENSE)
+
 Simple tool to help generate a [multiplatform, single-scheme Xcode project](http://promisekit.org/news/2016/08/Multiplatform-Single-Scheme-Xcode-Projects/).
 
 ## Installation
@@ -21,6 +24,44 @@ framework-generate
 
 To view the full `FrameworkSpec` documentation see the [`docs`](docs/FrameworkSpec.md) folder.
 
+## Contributing
+
+Love framework-generate but want to make it even better?
+
+Open source isn't just writing code. We could use your help with any of the
+following:
+
+- Finding (and reporting!) bugs.
+- New feature suggestions.
+- Answering questions on issues.
+- Documentation improvements.
+- Reviewing pull requests.
+- Helping to manage issue priorities.
+- Fixing bugs/new features.
+
+If any of that sounds cool to you, send a pull request! After a few
+contributions, we'll add you as an admin to the repo so you can merge pull
+requests and help build framework-generate.
+
+Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by [its terms](CODE_OF_CONDUCT.md).
+
+### How to contribute
+
+Contributing is easy but you will need to have bundler installed. If you don't it can be installed using:
+
+```bash
+[sudo] gem install bundler
+```
+
+When you have bundler installed, simply make your changes to the tool and then try it out using: 
+
+```bash
+bundle install
+bundle exec framework-generate
+```
+
+Once your change is good to go open up a pull request!
+
 ## License
 
 This project is licensed under the terms of the MIT license. See the [LICENSE](LICENSE) file.

data/bin/framework-generate

@@ -2,4 +2,4 @@
 
 require 'framework-generate'
 
-FrameworkGenerate::Runner.generate
+FrameworkGenerate::Runner.generate

data/lib/SampleFrameworkSpec

@@ -1,14 +1,12 @@
-project.name = #PROJECT_NAME#
-project.language = swift("3.0")
-project.platforms = [
+target = new_target do |target|
+  target.name = #TARGET_NAME#
+  target.language = swift("3.0")
+  target.platforms = [
     macos("10.11"),
     ios("8.0"),
     tvos("9.0"),
     watchos("2.0")
-]
-
-target = new_target do |target|
-  target.name = #TARGET_NAME#
+  ]
   target.info_plist = #TARGET_INFO_PLIST#
   target.bundle_id = #TARGET_BUNDLE_ID#
   target.include_files = [
@@ -16,6 +14,7 @@ target = new_target do |target|
   ]
 end
 
+project.name = #PROJECT_NAME#
 project.targets = [
   target
 ]

data/lib/framework-generate/platform.rb

@@ -5,7 +5,7 @@ module FrameworkGenerate
     def initialize(type = nil, minimum_version = nil, search_paths = nil)
       @type = type
       @minimum_version = minimum_version
-      @search_paths = search_paths == nil ? default_search_paths : search_paths
+      @search_paths = search_paths.nil? ? default_search_paths : search_paths
 
       yield(self) if block_given?
     end
@@ -16,21 +16,21 @@ module FrameworkGenerate
 
     def self.supported_platforms(platforms, is_test_target = false)
       platforms
-          .reject { |platform| is_test_target && platform.type == :watchos }
-          .map { |platform| platform.raw_values }
-          .join(' ')
+        .reject { |platform| is_test_target && platform.type == :watchos }
+        .map(&:raw_values)
+        .join(' ')
     end
 
     def self.find_platform(platforms, type)
       platforms.find { |platform| platform.type == type }
     end
 
-    def self.deployment_target(platforms, type)
-      find_platform(platforms, type).minimum_version
+    def self.deployment_target(platform)
+      platform.minimum_version
     end
 
-    def self.search_paths(platforms, type)
-      find_platform(platforms, type).search_paths
+    def self.search_paths(platform)
+      platform.search_paths
     end
 
     def raw_values

data/lib/framework-generate/project.rb

@@ -22,27 +22,27 @@ module FrameworkGenerate
     end
 
     # DSL
-    def new_target(&block)
+    def new_target
       Target.new do |target|
-        block.call(target)
+        yield(target)
       end
     end
 
-    def new_platform(&block)
+    def new_platform
       Platform.new do |platform|
-        block.call(platform)
+        yield(platform)
       end
     end
 
-    def new_language(&block)
+    def new_language
       Language.new do |language|
-        block.call(language)
+        yield(language)
       end
     end
-    
-    def new_script(&block)
+
+    def new_script
       Script.new do |script|
-        block.call(script)
+        yield(script)
       end
     end
 
@@ -73,9 +73,7 @@ module FrameworkGenerate
 
     # Interface
     def project_path
-      if File.extname(@name) == '.xcodeproj'
-        return @name
-      end
+      return @name if File.extname(@name) == '.xcodeproj'
 
       "#{@name}.xcodeproj"
     end
@@ -101,12 +99,11 @@ module FrameworkGenerate
       settings
     end
 
-    def target_with_name(project, name) 
-      project.native_targets.detect { |e| e.name == name } 
+    def target_with_name(project, name)
+      project.native_targets.detect { |e| e.name == name }
     end
 
     def generate
-
       project = Xcodeproj::Project.new(project_path)
 
       schemes_dir = Xcodeproj::XCScheme.user_data_dir(project.path)
@@ -151,7 +148,6 @@ module FrameworkGenerate
         scheme.save_as(project.path, target.name, true)
         xcschememanagement['SchemeUserState']["#{target.name}.xcscheme"] = {}
         xcschememanagement['SchemeUserState']["#{target.name}.xcscheme"]['isShown'] = true
-
       end
 
       project.native_targets.each do |target|
@@ -168,6 +164,5 @@ module FrameworkGenerate
 
       puts "Successfully generated #{project_path}"
     end
-
   end
 end

data/lib/framework-generate/target.rb

@@ -34,16 +34,33 @@ module FrameworkGenerate
 
       settings['INFOPLIST_FILE'] = @info_plist
       settings['PRODUCT_BUNDLE_IDENTIFIER'] = @bundle_id
-      settings['APPLICATION_EXTENSION_API_ONLY'] = @is_safe_for_extensions ? 'YES' : 'NO';
-      settings['SUPPORTED_PLATFORMS'] = FrameworkGenerate::Platform::supported_platforms(@platforms)
-      settings['MACOSX_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform::deployment_target(@platforms, :macos)
-      settings['IPHONEOS_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform::deployment_target(@platforms, :ios)
-      settings['TVOS_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform::deployment_target(@platforms, :tvos)
-      settings['WATCHOS_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform::deployment_target(@platforms, :watchos)
-      settings['FRAMEWORK_SEARCH_PATHS[sdk=macosx*]'] = FrameworkGenerate::Platform::search_paths(@platforms, :macos)
-      settings['FRAMEWORK_SEARCH_PATHS[sdk=iphone*]'] = FrameworkGenerate::Platform::search_paths(@platforms, :ios)
-      settings['FRAMEWORK_SEARCH_PATHS[sdk=appletv*]'] = FrameworkGenerate::Platform::search_paths(@platforms, :tvos)
-      settings['FRAMEWORK_SEARCH_PATHS[sdk=watch*]'] = FrameworkGenerate::Platform::search_paths(@platforms, :watchos)
+      settings['APPLICATION_EXTENSION_API_ONLY'] = @is_safe_for_extensions ? 'YES' : 'NO'
+      settings['SUPPORTED_PLATFORMS'] = FrameworkGenerate::Platform.supported_platforms(@platforms)
+
+      macos = FrameworkGenerate::Platform.find_platform(@platforms, :macos)
+      unless macos.nil?
+        settings['MACOSX_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform.deployment_target(macos)
+        settings['FRAMEWORK_SEARCH_PATHS[sdk=macosx*]'] = FrameworkGenerate::Platform.search_paths(macos)
+      end
+
+      ios = FrameworkGenerate::Platform.find_platform(@platforms, :ios)
+      unless ios.nil?
+        settings['IPHONEOS_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform.deployment_target(ios)
+        settings['FRAMEWORK_SEARCH_PATHS[sdk=iphone*]'] = FrameworkGenerate::Platform.search_paths(ios)
+      end
+
+      watchos = FrameworkGenerate::Platform.find_platform(@platforms, :watchos)
+      unless watchos.nil?
+        settings['WATCHOS_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform.deployment_target(watchos)
+        settings['FRAMEWORK_SEARCH_PATHS[sdk=watch*]'] = FrameworkGenerate::Platform.search_paths(watchos)
+      end
+
+      tvos = FrameworkGenerate::Platform.find_platform(@platforms, :tvos)
+      unless tvos.nil?
+        settings['TVOS_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform.deployment_target(tvos)
+        settings['FRAMEWORK_SEARCH_PATHS[sdk=appletv*]'] = FrameworkGenerate::Platform.search_paths(tvos)
+      end
+
       settings['SWIFT_VERSION'] = @language.version
 
       settings
@@ -55,7 +72,7 @@ module FrameworkGenerate
     end
 
     def add_framework_header(project, target)
-      return unless @header != nil
+      return if @header.nil?
       header_path = @header
       header_file_group = find_group(project, header_path)
       header_file = header_file_group.new_reference(header_path)
@@ -89,13 +106,13 @@ module FrameworkGenerate
     end
 
     def add_source_files(project, target)
-      if @exclude_files == nil
-        exclude_files = []
-      else
-        exclude_files = @exclude_files.map do |files|
-          Dir[files]
-        end
-      end
+      exclude_files = if @exclude_files.nil?
+                        []
+                      else
+                        @exclude_files.map do |files|
+                          Dir[files]
+                        end
+                      end
 
       source_files = @include_files.map do |files|
         Dir[files].reject do |path|
@@ -116,15 +133,13 @@ module FrameworkGenerate
     end
 
     def append_framework_extension(framework)
-      if File.extname(framework) == '.framework'
-        return framework
-      end
+      return framework if File.extname(framework) == '.framework'
 
       "#{framework}.framework"
     end
 
     def add_dependencies(project, target)
-      return unless @dependencies != nil
+      return if @dependencies.nil?
 
       dependency_names = @dependencies.map do |dependency|
         append_framework_extension(dependency)
@@ -156,21 +171,19 @@ module FrameworkGenerate
       else
         script_path = File.join(Dir.pwd, scripts_directory, script_file_name)
         dirname = File.dirname(script_path)
-        unless File.directory?(dirname)
-          FileUtils.mkdir_p(dirname)
-        end
+        FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
 
-        FileUtils.cp(script_file_path, script_path, { :preserve => true })
+        FileUtils.cp(script_file_path, script_path, preserve: true)
 
-        xcode_path = File.join("${SRCROOT}", scripts_directory, script_file_name)
+        xcode_path = File.join('${SRCROOT}', scripts_directory, script_file_name)
         build_phase.shell_script = " exec \"#{xcode_path}\""
       end
-      
+
       add_framework_to_copy_phase(project, build_phase)
     end
 
     def add_framework_to_copy_phase(project, build_phase)
-      return unless @dependencies != nil
+      return if @dependencies.nil?
 
       dependency_names = @dependencies.map do |dependency|
         append_framework_extension(dependency)
@@ -186,7 +199,7 @@ module FrameworkGenerate
     end
 
     def add_resource_files(project, target)
-      return unless @resource_files != nil
+      return if @resource_files.nil?
 
       files = @resource_files.map do |files|
         Dir[files]
@@ -205,9 +218,9 @@ module FrameworkGenerate
     end
 
     def add_build_scripts(target, scripts)
-      return unless scripts != nil
+      return if scripts.nil?
 
-      scripts.each do |script| 
+      scripts.each do |script|
         build_phase = target.new_shell_script_build_phase(script.name)
         build_phase.shell_script = script.script
         build_phase.input_paths = script.inputs
@@ -217,11 +230,11 @@ module FrameworkGenerate
     def add_pre_build_scripts(target)
       add_build_scripts(target, @pre_build_scripts)
     end
-    
+
     def add_post_build_scripts(target)
       add_build_scripts(target, @post_build_scripts)
     end
-    
+
     def create(project, language, scripts_directory)
       name = @name
       type = @type
@@ -252,7 +265,7 @@ module FrameworkGenerate
 
       target.build_phases << project.new(Xcodeproj::Project::Object::PBXResourcesBuildPhase)
       target.build_phases << project.new(Xcodeproj::Project::Object::PBXFrameworksBuildPhase)
-      
+
       # Post build script
       add_post_build_scripts(target)
 

data/lib/framework-generate.rb

@@ -9,14 +9,14 @@ module FrameworkGenerate
         puts "Couldn't find FrameworkSpec. Do you want to create one? [Y/N]"
         create_file = gets.chomp
 
-        if create_file == "Y"
+        if create_file.casecmp('Y').zero?
           sample_framework_spec = File.join(File.dirname(__FILE__), 'SampleFrameworkSpec')
 
           FileUtils.cp(sample_framework_spec, file_path)
 
-          abort "Created a FrameworkSpec. Update the contents of the FrameworkSpec file and rerun the command"
+          abort 'Created a FrameworkSpec. Update the contents of the FrameworkSpec file and rerun the command'
         elsif
-          abort "Cannot create a project without a FrameworkSpec"
+          abort 'Cannot create a project without a FrameworkSpec'
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: framework-generate
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Pierre-Marc Airoldi
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Tool to generate an Xcode framework project