xcres 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80b04c8fed347600827fbc19c5e653a9712f34ab
-  data.tar.gz: 60548aca09f900ee073773231edbd6cfce51a846
+  metadata.gz: 582ff4713e27360dad8eac366f7fb972e631696f
+  data.tar.gz: 95e46087ebe01b670c0cc4b03493e87963146b17
 SHA512:
-  metadata.gz: 032d1b4d09124dd1cecf1c587a8579bacc57e43aa051f68ea9a14300abd5426dddab95e075d9f83caa969aabed65969c25bb2057f2f332af5ed407f6aaec4346
-  data.tar.gz: d821c4b06474126ec9ca3bf0826b516ccc2143d9b6d42a6ba377229d8656c5218dd9ff553e99bf7ea40cd402e09e2a5e16c3070cf538abb55e9f84c345d10c4a
+  metadata.gz: 65b834e686b1f356abced830e74608fac622bc6c0d744ab7da13e8ce3592c18c42968c980b32d155f4bdd890a17ed10f301f4ad393e4a2c336e4d5cbab02d22e
+  data.tar.gz: dfa1cc9951f35286e886179f80f5560bcf8ce3c6cda38e287103209353418b30822ddeba41cfb7339237b92a8a866948e84f95c0182bf859e37e5514beca0162

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xcres (0.4.1)
+    xcres (0.4.2)
       activesupport (>= 3.2.15, < 4)
       clamp (~> 0.6.3)
       colored (~> 1.2)
@@ -11,7 +11,6 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.2.8)
     activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
@@ -62,8 +61,7 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     tins (1.3.2)
-    xcodeproj (0.18.0)
-      CFPropertyList (~> 2.2)
+    xcodeproj (0.19.4)
       activesupport (~> 3.0)
       colored (~> 1.2)
     yard (0.8.7.4)

data/README.md

@@ -1,4 +1,4 @@
-# xcres
+# <center>![xcres](/../assets/xcres_banner.png?raw=true)</center>
 
 [![Twitter: @mrackwitz](https://img.shields.io/badge/contact-@mrackwitz-blue.svg?style=flat)](https://twitter.com/mrackwitz)
 [![Gem](https://img.shields.io/gem/v/xcres.svg?style=flat)](http://rubygems.org/gems/xcres)
@@ -176,6 +176,11 @@ also warn you about those. It can be a help, if you want to migrate
 your project to non-natural language keys.
 
 
+## Credits
+
+The logo was designed by [@kuchengnom](https://github.com/kuchengnom).
+
+
 ## License
 
 xcres is available under MIT License.

data/lib/xcres/analyzer/analyzer.rb

@@ -53,7 +53,7 @@ module XCRes
     #         the built sections
     #
     def analyze
-      # Empty stub implementation
+      @sections = @sections.compact.reject { |s| s.items.nil? || s.items.empty? }
     end
 
     # Return the Xcode project to analyze

data/lib/xcres/analyzer/resources_analyzer/base_resources_analyzer.rb

@@ -79,20 +79,27 @@ module XCRes
       #
       # @param  [Hash] options
       #         valid options are:
-      #         * [Bool] :use_basename?
-      #           if set, it will only use the basename of the path for the key
+      #         * [Array<Symbol>] :use_basename
+      #           can contain :key and :path
       #
       # @return [Hash{String => Pathname}]
       #
       def build_section_data file_paths, options={}
-        options = { use_basename?: false }.merge options
+        options = {
+          use_basename: [],
+          path_without_ext: false,
+        }.merge options
 
         # Transform image file paths to keys
         keys_to_paths = {}
         for path in file_paths
-          path = options[:use_basename?] ? File.basename(path) : path.to_s
-          key = key_from_path(path)
-          keys_to_paths[key] = path
+          basename = File.basename(path)
+          key = key_from_path(options[:use_basename].include?(:key) ? basename : path.to_s)
+          transformed_path = options[:use_basename].include?(:path) ? basename : path
+          if options[:path_without_ext]
+            transformed_path = transformed_path.to_s.sub /#{File.extname(path)}$/, ''
+          end
+          keys_to_paths[key] = transformed_path.to_s
         end
 
         keys_to_paths

data/lib/xcres/analyzer/resources_analyzer/bundle_resources_analyzer.rb

@@ -9,7 +9,8 @@ module XCRes
     class BundleResourcesAnalyzer < BaseResourcesAnalyzer
 
       def analyze
-        @sections = build_sections_for_bundles.compact
+        @sections = build_sections_for_bundles
+        super
       end
 
       # Build a section for each bundle if it contains any resources
@@ -42,7 +43,7 @@ module XCRes
       # @param  [PBXFileReference] bundle_file_ref
       #         the file reference to the resources bundle file
       #
-      # @return [Section?]
+      # @return [Section]
       #         a section or nil
       #
       def build_section_for_bundle bundle_file_ref
@@ -51,14 +52,8 @@ module XCRes
 
         log "Found bundle %s with #%s image files of #%s total files.", bundle_file_ref.path, image_files.count, bundle_files.count
 
-        return nil if image_files.empty?
-
-        section_data = build_images_section_data(image_files)
-
-        return nil if section_data.empty?
-
         section_name = basename_without_ext(bundle_file_ref.path)
-
+        section_data = build_images_section_data(image_files)
         new_section(section_name, section_data)
       end
 

data/lib/xcres/analyzer/resources_analyzer/loose_resources_analyzer.rb

@@ -10,7 +10,8 @@ module XCRes
     class LooseResourcesAnalyzer < BaseResourcesAnalyzer
 
       def analyze
-        @sections = [build_section_for_loose_images].compact
+        @sections = [build_section_for_loose_images]
+        super
       end
 
       def exclude_file_patterns
@@ -19,16 +20,14 @@ module XCRes
 
       # Build a section for loose image resources in the project
       #
-      # @return [Section?]
+      # @return [Section]
       #
       def build_section_for_loose_images
         image_files = find_image_files(resources_files.map(&:path))
 
         log "Found #%s image files in project.", image_files.count
 
-        return nil if image_files.empty?
-
-        data = build_images_section_data(image_files, use_basename?: true)
+        data = build_images_section_data(image_files, use_basename: [:key, :path])
 
         new_section('Images', data)
       end

data/lib/xcres/analyzer/resources_analyzer/xcassets_analyzer.rb

@@ -10,9 +10,8 @@ module XCRes
     class XCAssetsAnalyzer < BaseResourcesAnalyzer
 
       def analyze
-        sections = []
-        sections += build_sections_for_xcassets
-        @sections = sections.compact
+        @sections = build_sections_for_xcassets
+        super
       end
 
       # Build a section for each asset catalog if it contains any resources
@@ -38,21 +37,18 @@ module XCRes
       # @param  [XCAssets::Bundle] xcassets_bundle
       #         the file reference to the resources bundle file
       #
-      # @return [Section?]
+      # @return [Section]
       #         a section or nil
       #
       def build_section_for_xcassets bundle
         log "Found asset catalog %s with #%s image files.",
           bundle.path.basename, bundle.resources.count
 
-        return nil if bundle.resources.empty?
-
-        section_data = build_images_section_data(bundle.resources.map(&:name))
-
-        return nil if section_data.empty?
-
         section_name = "#{basename_without_ext(bundle.path)}Assets"
-
+        section_data = build_images_section_data(bundle.resources.map(&:path), {
+          use_basename:     [:path],
+          path_without_ext: true
+        })
         new_section(section_name, section_data)
       end
 

data/lib/xcres/builder/file_builder.rb

@@ -10,7 +10,7 @@ class XCRes::FileBuilder
     # Ensure that the given directory exists
     output_dir = File.dirname output_path
     unless Dir.exist? output_dir
-      logger.success 'Directory did not exist. Will been created.'
+      logger.success 'Directory did not exist. Will be created.'
       Dir.mkdir output_dir
     end
 

data/lib/xcres/command/install_command.rb

@@ -45,20 +45,20 @@ class XCRes::InstallCommand < XCRes::ProjectCommand
   def find_parent_group
     # Get main group and ensure that it exists
     main_group = project.main_group
-    raise ArgumentError, "Didn't found main group" if main_group.nil?
+    raise ArgumentError, "Didn't find main group" if main_group.nil?
 
     # Get target-specific group, if the default project layout is in use
     src_group = main_group.groups.find { |g| g.path == target.name }
     if src_group != nil
       log "Found target group, will use its path as base output path."
     else
-      log "Didn't found target group, expected a group with path '#{target.name}'."
+      log "Didn't find target group, expected a group with path '#{target.name}'."
     end
 
     # Find 'Supporting Files' group
     groups = main_group.recursive_children_groups
     support_files_group = groups.find { |g| g.name == 'Supporting Files' }
-    warn "Didn't found support files group" if support_files_group.nil?
+    warn "Didn't find support files group" if support_files_group.nil?
 
     support_files_group || src_group || main_group
   end
@@ -101,6 +101,7 @@ class XCRes::InstallCommand < XCRes::ProjectCommand
     # Set shell script
     script_output_path = output_path.relative_path_from(src_root_path)
     build_phase.shell_script = "xcres --no-ansi build $PROJECT_FILE_PATH $SRCROOT/#{script_output_path}\n"
+    build_phase.show_env_vars_in_log = '0'
 
     # Find or create 'Resources' group in 'Supporting Files'
     res_group = parent_group.groups.find { |g| g.name == 'Resources' }

data/lib/xcres/command/project_command.rb

@@ -9,11 +9,11 @@ class XCRes::ProjectCommand < XCRes::Command
   option ['--[no-]documented'], :flag, 'Add documentation to the generated files', default: true
   #option ['-d', '--dry-run'], :flag, 'Does nothing on the file system'
 
-  option ['-t', '--target'], 'TARGET', 'Application target to use', attribute_name: :target_name
+  option ['-t', '--target'], 'TARGET', 'Target to search & analyze', attribute_name: :target_name
   option ['-x', '--exclude'], 'FILE_PATTERN', 'File pattern which should be excluded (default: ["InfoPlist.strings"])', multivalued: true, attribute_name: :exclude_file_patterns, default: ['InfoPlist.strings']
   option ['-n', '--name'], 'NAME', 'Name of the resources constant (default: `basename OUTPUT_PATH`)', attribute_name: :resources_constant_name
   option ['-l', '--language'], 'LANGUAGE', 'Default language to build the keys', attribute_name: :default_language do |language|
-    raise ArgumentError.new 'Expected a two-letter code conforming ISO 639-1 as LANGUAGE' unless String(language).length == 2
+    raise ArgumentError.new 'Expected a two-letter code conforming to ISO 639-1 as LANGUAGE' unless String(language).length == 2
     language
   end
 
@@ -50,8 +50,12 @@ class XCRes::ProjectCommand < XCRes::Command
   # @return [PBXNativeTarget]
   #
   def target
-    if target_name != nil
-      application_targets.find { |t| t.name == target }
+    @target ||= if target_name != nil
+      target = native_targets.find { |t| t.name == target_name }
+      if target.nil?
+        raise ArgumentError.new "Unknown target '#{target_name}'. "
+      end
+      target
     else
       if application_targets.count == 1
         application_targets.first
@@ -62,14 +66,23 @@ class XCRes::ProjectCommand < XCRes::Command
     end
   end
 
+  # Find all native targets in the project
+  #
+  # @return [Array<PBXNativeTarget>]
+  #
+  def native_targets
+    @native_targets ||= project.targets.select do |target|
+      target.is_a?(Xcodeproj::Project::Object::PBXNativeTarget)
+    end
+  end
+
   # Find all application targets in the project
   #
   # @return [Array<PBXNativeTarget>]
   #
   def application_targets
-    @application_targets ||= project.targets.select do |target|
-      target.is_a?(Xcodeproj::Project::Object::PBXNativeTarget) \
-        && target.product_type == Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]
+    @application_targets ||= native_targets.select do |target|
+      target.product_type == Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]
     end
   end
 
@@ -88,7 +101,7 @@ class XCRes::ProjectCommand < XCRes::Command
 
   def discover_xcodeproj_file_path!
     if xcodeproj_file_path.nil?
-      warn 'Argument XCODEPROJ is not set. Use the current directory.'
+      warn 'Argument XCODEPROJ is not set. Using the current directory.'
       discover_xcodeproj_file_path_in_dir! '.'
     elsif Dir.exist?(xcodeproj_file_path) && !File.fnmatch('*.xcodeproj', xcodeproj_file_path)
       warn 'Argument XCODEPROJ is a directory. ' \

data/lib/xcres/model/xcassets/bundle.rb

@@ -43,7 +43,7 @@ module XCRes::XCAssets
     #
     def read
       @resource_paths = Dir.chdir(path) do
-        Dir['*'].map { |p| Pathname(p) }
+        Dir['**/Contents.json'].map { |p| Pathname(p) + '..' }
       end
       @resources = @resource_paths.map do |path|
         Resource.new(self, path)

data/lib/xcres/version.rb

@@ -4,6 +4,6 @@ module XCRes
   #
   #   XCRes’s version, following [semver](http://semver.org).
   #
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 
 end

data/spec/fixtures/Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -14,6 +14,11 @@
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
     }
   ],
   "info" : {

data/spec/fixtures/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "GrumpyCat.jpg"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "GrumpyCat@2x.jpg"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "GrumpyCat@3x.jpg"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

data/spec/fixtures/Example/Example/Images.xcassets/Doge.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "scale" : "2x",
       "filename" : "doge@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

data/spec/integration.rb

@@ -16,6 +16,7 @@ CLIntegracon.configure do |c|
   c.ignores '**.DS_Store'
   c.ignores '.gitkeep'
   c.ignores %r[/xcuserdata/]
+  c.ignores %r[/DerivedData/]
 
   # Transform produced project files to YAMLs
   c.transform_produced "**/*.xcodeproj" do |path|

data/spec/integration/build-keyword-clash/after/R.h

@@ -8,8 +8,6 @@
 #import <Foundation/Foundation.h>
 
 extern const struct R {
-    struct Images {
-    } Images;
     struct Strings {
     } Strings;
 } R;

data/spec/integration/build-keyword-clash/after/R.m

@@ -8,8 +8,6 @@
 #import "R.h"
 
 const struct R R = {
-    .Images = {
-    },
     .Strings = {
     },
 };

data/spec/integration/build/after/Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -14,6 +14,11 @@
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
     }
   ],
   "info" : {

data/spec/integration/build/after/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "GrumpyCat.jpg"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "GrumpyCat@2x.jpg"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "GrumpyCat@3x.jpg"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

data/spec/integration/build/after/Example/Example/Images.xcassets/Doge.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "scale" : "2x",
       "filename" : "doge@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

data/spec/integration/build/after/R.h

@@ -21,6 +21,8 @@ extern const struct R {
     struct ImagesAssets {
         /// AppIcon
         __unsafe_unretained NSString *app;
+        /// GrumpyCat
+        __unsafe_unretained NSString *catsGrumpy;
         /// Doge
         __unsafe_unretained NSString *doge;
         /// LaunchImage

data/spec/integration/build/after/R.m

@@ -17,6 +17,7 @@ const struct R R = {
     },
     .ImagesAssets = {
         .app = @"AppIcon",
+        .catsGrumpy = @"GrumpyCat",
         .doge = @"Doge",
         .launch = @"LaunchImage",
     },

data/spec/integration/build/after/execution_output.txt

@@ -7,8 +7,8 @@
 Ⓥ Add section for Icons with 2 elements
 Ⓥ Found #1 image files in project.
 Ⓥ Found #1 asset catalogs in project.
-Ⓥ Found asset catalog Images.xcassets with #3 image files.
-Ⓥ Add section for ImagesAssets with 3 elements
+Ⓥ Found asset catalog Images.xcassets with #4 image files.
+Ⓥ Add section for ImagesAssets with 4 elements
 Ⓥ Strings files in project: ["en.lproj/InfoPlist.strings", "en.lproj/Localizable.strings", "de.lproj/Localizable.strings"]
 Ⓥ Native development languages: ["en"]
 Ⓥ Used languages for .strings files: ["en", "de"]

data/spec/integration/build/before/Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -14,6 +14,11 @@
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
     }
   ],
   "info" : {

data/spec/integration/build/before/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "GrumpyCat.jpg"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "GrumpyCat@2x.jpg"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "GrumpyCat@3x.jpg"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

data/spec/integration/build/before/Example/Example/Images.xcassets/Doge.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "scale" : "2x",
       "filename" : "doge@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

data/spec/integration/install-again/after/Example/Example.xcodeproj.yaml

@@ -34,7 +34,7 @@ Targets:
         shellPath: "/bin/sh"
         shellScript: |
           xcres --no-ansi build $PROJECT_FILE_PATH $SRCROOT/Example/Resources/R
-        showEnvVarsInLog: '1'
+        showEnvVarsInLog: '0'
         buildActionMask: '2147483647'
         runOnlyForDeploymentPostprocessing: '0'
     - SourcesBuildPhase:

data/spec/integration/install-moved-supporting-files/after/Example/Example.xcodeproj.yaml

@@ -35,7 +35,7 @@ Targets:
         shellPath: "/bin/sh"
         shellScript: |
           xcres --no-ansi build $PROJECT_FILE_PATH $SRCROOT/Supporting_Files/Resources/R
-        showEnvVarsInLog: '1'
+        showEnvVarsInLog: '0'
         buildActionMask: '2147483647'
         runOnlyForDeploymentPostprocessing: '0'
     - SourcesBuildPhase:

data/spec/integration/install-moved-supporting-files/after/execution_output.txt

@@ -2,7 +2,7 @@
 Ⓥ Verbose mode is enabled.
 ⚠ Argument XCODEPROJ is a directory. Try to locate the Xcode project in this directory.
 ✓ Use Example/Example.xcodeproj as XCODEPROJ.
-Ⓥ Didn't found target group, expected a group with path 'Example'.
+Ⓥ Didn't find target group, expected a group with path 'Example'.
 Execute build first:
     Ⓥ Verbose mode is enabled.
     ✓ Use Example/Example.xcodeproj as XCODEPROJ.
@@ -17,6 +17,6 @@ Execute build first:
     Ⓥ Preferred languages: ["en"]
     Ⓥ Strings files after language selection: ["InfoPlist.strings"]
     Ⓥ Non-ignored .strings files: []
-    ✓ Directory did not exist. Will been created.
+    ✓ Directory did not exist. Will be created.
     ✓ Successfully updated: ROOT/tmp/integration/install-moved-supporting-files/Example/Supporting_Files/Resources/R.h
 ✓ Successfully integrated into Example/Example.xcodeproj

data/spec/integration/install-no-supporting-files/after/Example/Example.xcodeproj.yaml

@@ -35,7 +35,7 @@ Targets:
         shellPath: "/bin/sh"
         shellScript: |
           xcres --no-ansi build $PROJECT_FILE_PATH $SRCROOT/Resources/R
-        showEnvVarsInLog: '1'
+        showEnvVarsInLog: '0'
         buildActionMask: '2147483647'
         runOnlyForDeploymentPostprocessing: '0'
     - SourcesBuildPhase:

data/spec/integration/install-no-supporting-files/after/execution_output.txt

@@ -2,8 +2,8 @@
 Ⓥ Verbose mode is enabled.
 ⚠ Argument XCODEPROJ is a directory. Try to locate the Xcode project in this directory.
 ✓ Use Example/Example.xcodeproj as XCODEPROJ.
-Ⓥ Didn't found target group, expected a group with path 'Example'.
-⚠ Didn't found support files group
+Ⓥ Didn't find target group, expected a group with path 'Example'.
+⚠ Didn't find support files group
 Execute build first:
     Ⓥ Verbose mode is enabled.
     ✓ Use Example/Example.xcodeproj as XCODEPROJ.
@@ -18,6 +18,6 @@ Execute build first:
     Ⓥ Preferred languages: ["en"]
     Ⓥ Strings files after language selection: ["InfoPlist.strings"]
     Ⓥ Non-ignored .strings files: []
-    ✓ Directory did not exist. Will been created.
+    ✓ Directory did not exist. Will be created.
     ✓ Successfully updated: ROOT/tmp/integration/install-no-supporting-files/Example/Resources/R.h
 ✓ Successfully integrated into Example/Example.xcodeproj

data/spec/integration/install/after/Example/Example.xcodeproj.yaml

@@ -34,7 +34,7 @@ Targets:
         shellPath: "/bin/sh"
         shellScript: |
           xcres --no-ansi build $PROJECT_FILE_PATH $SRCROOT/Example/Resources/R
-        showEnvVarsInLog: '1'
+        showEnvVarsInLog: '0'
         buildActionMask: '2147483647'
         runOnlyForDeploymentPostprocessing: '0'
     - SourcesBuildPhase:

data/spec/integration/install/after/execution_output.txt

@@ -17,6 +17,6 @@ Execute build first:
     Ⓥ Preferred languages: ["en"]
     Ⓥ Strings files after language selection: ["en.lproj/InfoPlist.strings"]
     Ⓥ Non-ignored .strings files: []
-    ✓ Directory did not exist. Will been created.
+    ✓ Directory did not exist. Will be created.
     ✓ Successfully updated: ROOT/tmp/integration/install/Example/Example/Resources/R.h
 ✓ Successfully integrated into Example/Example.xcodeproj

data/spec/integration/version/after/execution_output.txt

@@ -1,3 +1,3 @@
  xcres version --verbose --no-ansi 2>&1
 Ⓥ Verbose mode is enabled.
-0.4.1
+0.4.2

data/spec/spec_helper/xcodeproj_project_yaml.rb

@@ -12,6 +12,21 @@ class Xcodeproj::Project::Object::PBXShellScriptBuildPhase
   end
 end
 
+class Xcodeproj::Project::Object::XCBuildConfiguration
+  def pretty_print
+    data = {}
+    data['Build Settings'] = {}.tap do |sorted_settings|
+      build_settings.keys.sort.each do |key|
+        sorted_settings[key] = build_settings[key]
+      end
+    end
+    if base_configuration_reference
+      data['Base Configuration'] = base_configuration_reference.pretty_print
+    end
+    { name => data }
+  end
+end
+
 class Xcodeproj::Project
   def to_yaml
     pretty_print_output = pretty_print

data/spec/unit/analyzer/resources_analyzer/base_resources_analyzer_spec.rb

@@ -20,16 +20,37 @@ describe 'XCRes::ResourcesAnalyzer::BaseResourcesAnalyzer' do
       @analyzer.build_images_section_data([]).should.eql?({})
     end
 
-    describe 'option use_basename? is not given' do
+    describe 'option use_basename is not given' do
       it 'builds an items hash and keep the path' do
         @analyzer.build_images_section_data([Pathname('b/a.m'), Pathname('b/a.gif')])
           .should.eql?({ 'b/a' => 'b/a.gif' })
       end
     end
 
-    describe 'option use_basename? is given as true' do
+    describe 'option use_basename is given as []' do
+      it 'builds an items hash and keep the path' do
+        @analyzer.build_images_section_data([Pathname('b/a.m'), Pathname('b/a.gif')], use_basename: [])
+          .should.eql?({ 'b/a' => 'b/a.gif' })
+      end
+    end
+
+    describe 'option use_basename is given as [:key]' do
       it 'builds an items hash and remove the path' do
-        @analyzer.build_images_section_data([Pathname('b/a.m'), Pathname('b/a.gif')], use_basename?: true)
+        @analyzer.build_images_section_data([Pathname('b/a.m'), Pathname('b/a.gif')], use_basename: [:key])
+          .should.eql?({ 'a' => 'b/a.gif' })
+      end
+    end
+
+    describe 'option use_basename is given as [:path]' do
+      it 'builds an items hash and remove the path' do
+        @analyzer.build_images_section_data([Pathname('b/a.m'), Pathname('b/a.gif')], use_basename: [:path])
+          .should.eql?({ 'b/a' => 'a.gif' })
+      end
+    end
+
+    describe 'option use_basename is given as [:key,:path]' do
+      it 'builds an items hash and remove the path' do
+        @analyzer.build_images_section_data([Pathname('b/a.m'), Pathname('b/a.gif')], use_basename: [:key, :path])
           .should.eql?({ 'a' => 'a.gif' })
       end
     end
@@ -78,19 +99,31 @@ describe 'XCRes::ResourcesAnalyzer::BaseResourcesAnalyzer' do
       @analyzer.build_section_data([]).should.be.eql?({})
     end
 
-    it 'returns a hash with the basename if option use_basename? is enabled' do
+    it 'returns a hash with the basename if option use_basename is [:key]' do
+      @analyzer.expects(:key_from_path).with('b').returns('b')
+      @analyzer.build_section_data(@file_paths, use_basename: [:key])
+        .should.be.eql?({ 'b' => 'a/b' })
+    end
+
+    it 'returns a hash with the basename if option use_basename is [:path]' do
+      @analyzer.expects(:key_from_path).with('a/b').returns('a/b')
+      @analyzer.build_section_data(@file_paths, use_basename: [:path])
+        .should.be.eql?({ 'a/b' => 'b' })
+    end
+
+    it 'returns a hash with the basename if option use_basename is [:key, :path]' do
       @analyzer.expects(:key_from_path).with('b').returns('b')
-      @analyzer.build_section_data(@file_paths, use_basename?: true)
+      @analyzer.build_section_data(@file_paths, use_basename: [:key, :path])
         .should.be.eql?({ 'b' => 'b' })
     end
 
-    it 'returns a hash with relative paths if option use_basename? is disabled' do
+    it 'returns a hash with relative paths if option use_basename is []' do
       @analyzer.expects(:key_from_path).with('a/b').returns('a/b')
-      @analyzer.build_section_data(@file_paths, use_basename?: false)
+      @analyzer.build_section_data(@file_paths, use_basename: [])
         .should.be.eql?({ 'a/b' => 'a/b' })
     end
 
-    it 'returns a hash with relative paths if option use_basename? is not given' do
+    it 'returns a hash with relative paths if option use_basename is not given' do
       @analyzer.expects(:key_from_path).with('a/b').returns('a/b')
       @analyzer.build_section_data(@file_paths)
         .should.be.eql?({ 'a/b' => 'a/b' })

data/spec/unit/analyzer/resources_analyzer/bundle_resources_analyzer_spec.rb

@@ -39,13 +39,13 @@ describe 'XCRes::ResourcesAnalyzer::BundleResourcesAnalyzer' do
 
     it 'should return nil if the bundle does not contain any images' do
       @analyzer.expects(:find_files_in_dir).with(@mock_bundle.real_path).returns([Pathname('a.m')])
-      @analyzer.build_section_for_bundle(@mock_bundle).should.be.nil?
+      @analyzer.build_section_for_bundle(@mock_bundle).items.should.be.empty
     end
 
     it 'should return nil if the bundle does not contain any valid images' do
       @analyzer.expects(:find_files_in_dir).with(@mock_bundle.real_path).returns([Pathname('a.gif')])
       @analyzer.exclude_file_patterns = ['a.gif']
-      @analyzer.build_section_for_bundle(@mock_bundle).should.be.nil?
+      @analyzer.build_section_for_bundle(@mock_bundle).items.should.be.empty
     end
 
     it 'should build a new section if the bundle contain valid images' do

data/spec/unit/model/xcassets/bundle_spec.rb

@@ -43,12 +43,19 @@ module XCAssetsSpec
       it 'should set the resource paths' do
         @bundle.resource_paths.should.be.eql? [
           Pathname('AppIcon.appiconset'),
+          Pathname('Cats/GrumpyCat.imageset'),
           Pathname('Doge.imageset'),
           Pathname('LaunchImage.launchimage'),
         ]
       end
 
       shared 'XCAssets resource' do
+        path = @name
+
+        before do
+          @res = @bundle.resources.find { |r| r.path.to_s == path }
+        end
+
         it 'should match the info' do
           @res.info.should.be.eql?({ "version" => 1, "author" => "xcode" })
         end
@@ -56,14 +63,8 @@ module XCAssetsSpec
 
       describe 'resources' do
         describe 'AppIcon.appiconset' do
-          before { @res = @bundle.resources[0] }
-
           behaves_like 'XCAssets resource'
 
-          it 'should match the path' do
-            @res.path.should.be.eql? Pathname('AppIcon.appiconset')
-          end
-
           it 'should match the name' do
             @res.name.should.be.eql? 'AppIcon'
           end
@@ -77,19 +78,38 @@ module XCAssetsSpec
               ResourceImage.new(idiom: 'iphone', scale: 2, size: '29x29'),
               ResourceImage.new(idiom: 'iphone', scale: 2, size: '40x40'),
               ResourceImage.new(idiom: 'iphone', scale: 2, size: '60x60'),
+              ResourceImage.new(idiom: 'iphone', scale: 3, size: '60x60'),
             ]
           end
         end
 
-        describe 'Doge.imageset' do
-          before { @res = @bundle.resources[1] }
-
+        describe 'Cats/GrumpyCat.imageset' do
           behaves_like 'XCAssets resource'
 
-          it 'should match the path' do
-            @res.path.should.be.eql? Pathname('Doge.imageset')
+          it 'should match the name' do
+            @res.name.should.be.eql? 'GrumpyCat'
           end
 
+          it 'should match the type' do
+            @res.type.should.be.eql? 'imageset'
+          end
+
+          it 'should match the info' do
+            @res.info.should.be.eql?({ "version" => 1, "author" => "xcode" })
+          end
+
+          it 'should match the images' do
+            @res.images.should.be.eql? [
+                ResourceImage.new(idiom: 'universal', scale: 1, filename: 'GrumpyCat.jpg'),
+                ResourceImage.new(idiom: 'universal', scale: 2, filename: 'GrumpyCat@2x.jpg'),
+                ResourceImage.new(idiom: 'universal', scale: 3, filename: 'GrumpyCat@3x.jpg'),
+            ]
+          end
+        end
+
+        describe 'Doge.imageset' do
+          behaves_like 'XCAssets resource'
+
           it 'should match the name' do
             @res.name.should.be.eql? 'Doge'
           end
@@ -106,19 +126,14 @@ module XCAssetsSpec
             @res.images.should.be.eql? [
               ResourceImage.new(idiom: 'universal', scale: 1, filename: 'doge.png'),
               ResourceImage.new(idiom: 'universal', scale: 2, filename: 'doge@2x.png'),
+              ResourceImage.new(idiom: 'universal', scale: 3),
             ]
           end
         end
 
         describe 'LaunchImage.launchimage' do
-          before { @res = @bundle.resources[2] }
-
           behaves_like 'XCAssets resource'
 
-          it 'should match the path' do
-            @res.path.should.be.eql? Pathname('LaunchImage.launchimage')
-          end
-
           it 'should match the name' do
             @res.name.should.be.eql? 'LaunchImage'
           end

data/spec/unit/model/xcassets/resource_spec.rb

@@ -31,7 +31,11 @@ module XCAssetsSpec
             "idiom" => "universal",
             "scale" => "2x",
             "filename" => "doge@2x.png"
-          }
+          },
+          {
+            "idiom" => "universal",
+            "scale" => "3x"
+          },
         ],
         "info" => expected_info
       }
@@ -130,6 +134,7 @@ module XCAssetsSpec
           @res.images.should.be.eql? [
             ResourceImage.new(idiom: 'universal', scale: 1, filename: 'doge.png'),
             ResourceImage.new(idiom: 'universal', scale: 2, filename: 'doge@2x.png'),
+            ResourceImage.new(idiom: 'universal', scale: 3),
           ]
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcres
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Marius Rackwitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -261,6 +261,10 @@ files:
 - spec/fixtures/Example/Example/Example-Info.plist
 - spec/fixtures/Example/Example/Example-Prefix.pch
 - spec/fixtures/Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json
+- spec/fixtures/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/Contents.json
+- spec/fixtures/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat.jpg
+- spec/fixtures/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat@2x.jpg
+- spec/fixtures/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat@3x.jpg
 - spec/fixtures/Example/Example/Images.xcassets/Doge.imageset/Contents.json
 - spec/fixtures/Example/Example/Images.xcassets/Doge.imageset/doge.png
 - spec/fixtures/Example/Example/Images.xcassets/Doge.imageset/doge@2x.png
@@ -366,6 +370,10 @@ files:
 - spec/integration/build/after/Example/Example/Icons.bundle/tab_bar/tabbar_map.png
 - spec/integration/build/after/Example/Example/Icons.bundle/tab_bar/tabbar_map@2x.png
 - spec/integration/build/after/Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json
+- spec/integration/build/after/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/Contents.json
+- spec/integration/build/after/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat.jpg
+- spec/integration/build/after/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat@2x.jpg
+- spec/integration/build/after/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat@3x.jpg
 - spec/integration/build/after/Example/Example/Images.xcassets/Doge.imageset/Contents.json
 - spec/integration/build/after/Example/Example/Images.xcassets/Doge.imageset/doge.png
 - spec/integration/build/after/Example/Example/Images.xcassets/Doge.imageset/doge@2x.png
@@ -390,6 +398,10 @@ files:
 - spec/integration/build/before/Example/Example/Icons.bundle/tab_bar/tabbar_map.png
 - spec/integration/build/before/Example/Example/Icons.bundle/tab_bar/tabbar_map@2x.png
 - spec/integration/build/before/Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json
+- spec/integration/build/before/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/Contents.json
+- spec/integration/build/before/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat.jpg
+- spec/integration/build/before/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat@2x.jpg
+- spec/integration/build/before/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat@3x.jpg
 - spec/integration/build/before/Example/Example/Images.xcassets/Doge.imageset/Contents.json
 - spec/integration/build/before/Example/Example/Images.xcassets/Doge.imageset/doge.png
 - spec/integration/build/before/Example/Example/Images.xcassets/Doge.imageset/doge@2x.png
@@ -552,6 +564,10 @@ test_files:
 - spec/fixtures/Example/Example/Example-Info.plist
 - spec/fixtures/Example/Example/Example-Prefix.pch
 - spec/fixtures/Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json
+- spec/fixtures/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/Contents.json
+- spec/fixtures/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat.jpg
+- spec/fixtures/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat@2x.jpg
+- spec/fixtures/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat@3x.jpg
 - spec/fixtures/Example/Example/Images.xcassets/Doge.imageset/Contents.json
 - spec/fixtures/Example/Example/Images.xcassets/Doge.imageset/doge.png
 - spec/fixtures/Example/Example/Images.xcassets/Doge.imageset/doge@2x.png
@@ -657,6 +673,10 @@ test_files:
 - spec/integration/build/after/Example/Example/Icons.bundle/tab_bar/tabbar_map.png
 - spec/integration/build/after/Example/Example/Icons.bundle/tab_bar/tabbar_map@2x.png
 - spec/integration/build/after/Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json
+- spec/integration/build/after/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/Contents.json
+- spec/integration/build/after/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat.jpg
+- spec/integration/build/after/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat@2x.jpg
+- spec/integration/build/after/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat@3x.jpg
 - spec/integration/build/after/Example/Example/Images.xcassets/Doge.imageset/Contents.json
 - spec/integration/build/after/Example/Example/Images.xcassets/Doge.imageset/doge.png
 - spec/integration/build/after/Example/Example/Images.xcassets/Doge.imageset/doge@2x.png
@@ -681,6 +701,10 @@ test_files:
 - spec/integration/build/before/Example/Example/Icons.bundle/tab_bar/tabbar_map.png
 - spec/integration/build/before/Example/Example/Icons.bundle/tab_bar/tabbar_map@2x.png
 - spec/integration/build/before/Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json
+- spec/integration/build/before/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/Contents.json
+- spec/integration/build/before/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat.jpg
+- spec/integration/build/before/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat@2x.jpg
+- spec/integration/build/before/Example/Example/Images.xcassets/Cats/GrumpyCat.imageset/GrumpyCat@3x.jpg
 - spec/integration/build/before/Example/Example/Images.xcassets/Doge.imageset/Contents.json
 - spec/integration/build/before/Example/Example/Images.xcassets/Doge.imageset/doge.png
 - spec/integration/build/before/Example/Example/Images.xcassets/Doge.imageset/doge@2x.png