fwtoolkit 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '019162ac50c1af63fa6b1ff17c1bceafaf93fabbd8f67bfa38853e5ebd5ce45c'
-  data.tar.gz: c0e43f9f2cb8d7d7147c9a6bac3b38dbaff8de637567a2898667cc9fff71eb3a
+  metadata.gz: aa49fa07517de5e9f57dbb7365950f955663db8bb7605011e244e4d10dcb343d
+  data.tar.gz: 38e0e62b1f4c6778c1dba90a18e2069d20ba068e0d71c8d1a4664dc5fa4e0106
 SHA512:
-  metadata.gz: 7d8c40a7fd54421e5104ae0231d1731d4bce0f5bea66a153fd683a60b39e272427b84c5f38e036a828ca4549b7554f4656506c6ea4f6bad7d79352ac5cabe7f3
-  data.tar.gz: c45cf4ae466ff16db10e9d1c8ab3491d3ca35068b93b05e5b03ca8fd91004fd75cca9d3a20e0796e2f7ff870880be229a53bcc24f67bd7077c871c09db2ef60a
+  metadata.gz: 22ec8684f5efa4c3a6bb8f0835047f3ff4f9dab27956a1600ccaf05a54f7f629ce01ee29a6dbe2656049f6deef988357e398d639db58054e6a74aeff54947cfd
+  data.tar.gz: 6cb1def635dc8e8bf53e0bbd428e16e9d832eea8b5c7a56f367687ebec3f56c30a9c4fbd1804a30dfff2d5e99f01a5d674c4d908c12c2e1a9c42d581c89f614b

data/features/git/create.feature

@@ -19,11 +19,3 @@ Feature: Create a git repo
     """
     There's already a repository at path
     """
-    @slow
-  Scenario: Create a git repository on a folder with files in it
-    Given a directory named "my_project"
-    Given a valid .gitignore file exists inside a directory named "my_project"
-    Given the directory "my_project" contains an uncommitted file named "my_file.c"
-    When I successfully run `fwt git new my_project`
-    Then an initialized git repository should exists inside a directory named "my_project"
-    And the file named "my_file.c" should have been committed to the repository at path "my_project"

data/features/xcode/create.feature

@@ -8,35 +8,21 @@ Feature: Create new project
 
   @xcode
   Scenario: Create a new project
-    When I successfully run `fwt xcode new MyProject AAA`
+    When I successfully run `fwt xcode new objc MyProject AAA`
     Then I cd to "MyProject"
     And the following directories should exist:
       | MyProject.xcworkspace |
       | MyProject/MyProject.xcodeproj |
-      | MyProject/MyProject/Supporting Files/Settings.bundle |
-      | MyProject/Myproject/Supporting Files/en.lproj |
-      | MyProject/MyprojectTests/Supporting Files/en.lproj |
+      | MyProject/MyProject/Resources/Assets.xcassets |
+      | MyProject/MyProject/Resources/Assets.xcassets/AppIcon.appiconset |
+      | MyProject/MyProject/Resources/Base.lproj |
     And the following files should exist:
       | MyProject/MyProject/AAAAppDelegate.h |
       | MyProject/MyProject/AAAAppDelegate.m |
-      | MyProject/MyProject/Supporting Files/MyProject-Info.plist |
-      | MyProject/MyProject/Supporting Files/MyProject-Prefix.pch |
+      | MyProject/MyProject.entitlements |
+      | MyProject/MyProject/Supporting Files/Info.plist |
       | MyProject/MyProject/Supporting Files/fw-shared.xcconfig |
       | MyProject/MyProject/Supporting Files/main.m |
-      | MyProject/MyProject/Supporting Files/version.sh |
-      | MyProject/MyProjectTests/Supporting Files/MyProjectTests-Info.plist |
-      | MyProject/MyProjectTests/MyProjectTests.h |
-      | MyProject/MyProjectTests/MyProjectTests.m |
-      | MyProject/Resources/Default.png |
-      | MyProject/Resources/Default@2x.png |
-      | MyProject/Resources/Default-568h@2x.png |
-    And I successfully run `xcodebuild -scheme MyProject -workspace MyProject.xcworkspace -sdk iphonesimulator6.0`
-
-  @xcode
-  Scenario: Fails to create a new project is the project dir is not empty
-    Given a directory named "MyProject"
-    When I run `fwt xcode new MyProject AAA`
-    Then the stderr should contain:
-    """
-    Can't create the project. The directory
-    """
+      | MyProject/MyProjectTests/Resources/Info.plist |
+      | MyProject/MyProjectTests/AAAMyProjectTests.m |
+    And I successfully run `xcodebuild -scheme MyProject -workspace MyProject.xcworkspace -sdk iphonesimulator`

data/lib/fwtoolkit/cli.rb

@@ -24,6 +24,8 @@ module FWToolkit
 
     register FWToolkit::Bitrise, 'bitrise', 'bitrise SUBCOMMAND ...ARG', 'Create bitrise configuration files'
     register FWToolkit::Project, 'proj', 'proj SUBCOMMAND ...ARG', 'Create projects and manage settings'
+    register FWToolkit::Xcode, 'xcode', 'xcode SUBCOMMAND ...ARG', 'Create Xcode projects'
+    register FWToolkit::Git, 'git', 'git SUBCOMMAND ...ARG', 'Git operations'
   end
 end
 

data/lib/fwtoolkit/cli/project.rb

@@ -32,15 +32,17 @@ module FWToolkit
         return
       end
 
-      destination_root = File.join(Dir.pwd, project_name)
+      clean_project_name = project_name.gsub("-", "_")
+
+      destination_root = File.join(Dir.pwd, clean_project_name)
 
       say "Creating new project in: #{File.expand_path destination_root}"
 
       invoke :conf_gemset, [destination_root]
 
-      invoke FWToolkit::Bitrise, 'new', [destination_root, project_name]
+      invoke FWToolkit::Bitrise, 'new', [destination_root, clean_project_name]
 
-      invoke FWToolkit::Xcode, 'new', [project_language, project_name, class_prefix.upcase, File.join(Dir.pwd, project_name)]
+      invoke FWToolkit::Xcode, 'new', [project_language, clean_project_name, class_prefix.upcase, File.join(Dir.pwd, clean_project_name)]
       invoke FWToolkit::Cocoapods, 'install', [destination_root]
 
       git_repo = GitClient::Repository.new destination_root

data/lib/fwtoolkit/cli/xcode.rb

@@ -25,7 +25,7 @@ module FWToolkit
     include FWToolkit::ThorUtils
     source_root_templates!
 
-    desc "new [PROJECT_NAME] [CLASS_PREFIX]", "Create a new Xcode project with FW's settings"
+    desc "new [LANGUAGE] [PROJECT_NAME] [CLASS_PREFIX]", "Create a new Xcode project with FW's settings"
     def new(project_language, project_name, class_prefix, root_dir=File.join(Dir.pwd, project_name))
       say 'Creating Xcode project'
       destination_root = root_dir

data/lib/fwtoolkit/projectfile.rb

@@ -42,8 +42,6 @@ module FWToolkit
       d[:xcode_project] = "#{File.join(conf_hash[:project_name], conf_hash[:project_name])}.xcodeproj" 
       d[:source_root] = File.join conf_hash[:project_name], d[:target_name]  
       d[:tests_source_root] = File.join conf_hash[:project_name], d[:tests_target_name] 
-      d[:frank_root] = File.join conf_hash[:project_name], d[:target_name], 'Frank' 
-      d[:frankified_app] = File.join d[:frank_root], 'frankified_build', 'Frankified.app'
       d
     end
   end

data/lib/fwtoolkit/version.rb

@@ -1,3 +1,3 @@
 module FWToolkit
-	VERSION = "2.3.2"
+	VERSION = "2.3.3"
 end

data/templates/bitrise/bitrise.yml.tt

@@ -88,7 +88,7 @@ workflows:
     - EXPORT_TYPE: app-store
       opts:
         is_expand: true
-    - CODESIGN_IDENTITY: 'iPhone Distribution: Future Workshops Ltd (F94732585Z)'
+    - CODESIGN_IDENTITY: 'Apple Distribution: Future Workshops Ltd (F94732585Z)'
       opts:
         is_expand: true
     - KEYCHAIN_NAME: fw_ltd.p12
@@ -124,7 +124,7 @@ workflows:
     - EXPORT_TYPE: app-store
       opts:
         is_expand: true
-    - CODESIGN_IDENTITY: 'iPhone Distribution: Future Workshops Ltd (F94732585Z)'
+    - CODESIGN_IDENTITY: 'Apple Distribution: Future Workshops Ltd (F94732585Z)'
       opts:
         is_expand: true
     - KEYCHAIN_NAME: fw_ltd.p12

data/templates/default_project/bitrise/bitrise.yml.tt

@@ -88,7 +88,7 @@ workflows:
     - EXPORT_TYPE: app-store
       opts:
         is_expand: true
-    - CODESIGN_IDENTITY: 'iPhone Distribution: Future Workshops Ltd (F94732585Z)'
+    - CODESIGN_IDENTITY: 'Apple Distribution: Future Workshops Ltd (F94732585Z)'
       opts:
         is_expand: true
     - KEYCHAIN_NAME: fw_ltd.p12
@@ -124,7 +124,7 @@ workflows:
     - EXPORT_TYPE: app-store
       opts:
         is_expand: true
-    - CODESIGN_IDENTITY: 'iPhone Distribution: Future Workshops Ltd (F94732585Z)'
+    - CODESIGN_IDENTITY: 'Apple Distribution: Future Workshops Ltd (F94732585Z)'
       opts:
         is_expand: true
     - KEYCHAIN_NAME: fw_ltd.p12

data/templates/default_project/git/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,8 @@
-[Finishes #<PIVOTAL_TASK_NUMBER>]
- 
+<!-- You can associate this PR to a Jira task, by adding, for example [SBA-8931] to the description. -->
+<!-- The jira automation will create a link over all this text -->
+
+[Jira Task code]
+
 <Task description>
 
 **Steps to test:**
@@ -10,4 +13,4 @@
 
 **Expected result:**
 
-<A description of the expected results, after, and during the previous steps>
+<A description of the expected results, after, and during the previous steps>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fwtoolkit
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Future Workshops
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -239,9 +239,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/fwt
-- features/cocoapods/setup.feature
-- features/frank/model.feature
-- features/frank/setup.feature
 - features/git/create.feature
 - features/project/create.feature
 - features/step_definitions/aruba_steps.rb
@@ -403,9 +400,6 @@ signing_key:
 specification_version: 4
 summary: Future Workshops project tools
 test_files:
-- features/cocoapods/setup.feature
-- features/frank/model.feature
-- features/frank/setup.feature
 - features/git/create.feature
 - features/project/create.feature
 - features/step_definitions/aruba_steps.rb

data/features/cocoapods/setup.feature

@@ -1,60 +0,0 @@
-Feature: Installing cocoapods
-    As a lead developer
-    In order to work with cocoapods in my project
-    I want my system to be configured correctly
-
-  @slow @pods
-  Scenario: Install and configure cocoapods for a user without cocoapods installed
-    Given I'm using a clean gemset "fwtoolkit_test" containing fwtoolkit.gem
-    And I'm using a clean home directory
-    And I force aruba-double path-hijacking
-    And I double `pod`
-    And I double `sudo`
-    And I double `git`
-    When I successfully run `fwt pods setup`
-    Then the double `sudo gem install cocoapods` should have been run
-    And a directory named "homedir/.cocoapods/fw" should exist
-
-  @slow @pods
-  Scenario: Configure fw's cocoapods for a user that has cocoapods already installed
-    Given I'm using a clean gemset "fwtoolkit_test" containing fwtoolkit.gem
-    And I'm using a clean home directory
-    And I force aruba-double path-hijacking
-    And I double the gem "cocoapods"
-    And I double `pod`
-    And I double `sudo`
-    When I successfully run `fwt pods setup`
-    Then the stdout should contain:
-    """
-    Cocoapods is already installed
-    """
-    And a directory named "homedir/.cocoapods/fw" should exist
-
-  @slow @pods
-  Scenario: Configure fw's cocoapods for a user that has messed up his/her installation
-    Given I'm using a clean gemset "fwtoolkit_test" containing fwtoolkit.gem
-    And I'm using a clean home directory
-    And a directory named ".cocoapods/fw" inside the home directory
-    And I force aruba-double path-hijacking
-    And I double `gem`
-    And I double `sudo`
-    When I successfully run `fwt pods setup`
-    Then the double `sudo gem install cocoapods` should have been run
-    And the stdout should contain:
-    """
-    FW's podspec repository already installed
-    """
-
-  @slow @pods
-  Scenario: Configure a project with Cocoapods
-    Given a directory named "MyProject"
-    And I double `bundle`
-    And I cd to "MyProject"
-    And an empty file named "Gemfile"
-    And I cd to ".."
-    When I successfully run `fwt pods install MyProject`
-    Then the file "MyProject/Gemfile" should contain:
-    """
-    gem "Cocoapods"
-    """
-    And the double `bundle exec pod install` should have been run

data/features/frank/model.feature

@@ -1,20 +0,0 @@
-Feature: Create frank model from core data
-  As a lead developer working on a project
-  I want to generate ruby classes that mirror my CoreData model 
-  So I can refer to core data entities from my Frank tests
-
-  Background: 
-    Given a configured installation of FWToolkit for "Tom the Dev" working for "Awesome Company"
-
-  @frank 
-  Scenario: generate ruby model from CoreData
-    Given an initialized FW iOS project named "MyProject"
-    And the project "MyProject" contains a valid CoreData model
-    When I run `fwt test model MyProject`
-    Then I cd to "MyProject"
-    And the following files should exist:
-      | MyProject/Frank/features/support/views/my_objects_json.erb |
-      | MyProject/Frank/features/support/views/my_objects_xml.erb |
-      | MyProject/Frank/features/support/models/factories.rb |
-      | MyProject/Frank/features/support/models/Ent1.rb |
-      | MyProject/Frank/features/support/models/Ent2.rb |

data/features/frank/setup.feature

@@ -1,28 +0,0 @@
-Feature: Frankifie a project
-  As a lead developer working on a project
-  I want a quick way to set up my project with frank
-  So I can add BDD tests to it
-
-  Background: 
-    Given a configured installation of FWToolkit for "Tom the Dev" working for "Awesome Company"
-
-  @frank @no-clobber @test @announce
-  Scenario: setup an existing project
-    Given an initialized FW iOS project named "MyProject"
-    When I successfully run `fwt test setup MyProject`
-    Then I cd to "MyProject"
-    And the following files should exist:
-      | MyProject/MyProject/AAAAppDelegate+Frank.h |
-      | MyProject/MyProject/AAAAppDelegate+Frank.m |
-      | MyProject/Frank/Features/step_definitions/launch_steps.rb |
-      | MyProject/Frank/Features/support/env.rb |
-      | MyProject/Frank/Features/support/mimic.rb |
-
-
-  @frank @slom
-  Scenario: try to setup a project that already has frank
-    Given an initialized FW iOS project named "MyProject"
-    And I successfully run `fwt test setup MyProject`
-    When I run `fwt test setup MyProject`
-    Then the output should contain "Frank is already set up for the project"
-