Skip to content
This repository has been archived by the owner on Jul 23, 2019. It is now read-only.

Commit

Permalink
Merge pull request #9 from vokal-isaac/master
Browse files Browse the repository at this point in the history
Mustache! Swift!
  • Loading branch information
designatednerd committed Oct 30, 2014
2 parents d23785c + 9116251 commit c2afbae
Show file tree
Hide file tree
Showing 228 changed files with 19,800 additions and 280 deletions.
173 changes: 161 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,172 @@
# OS X
#########################
# .gitignore file for Xcode4 and Xcode5 Source projects
#
# Apple bugs, waiting for Apple to fix/respond:
#
# 15564624 - what does the xccheckout file in Xcode5 do? Where's the documentation?
#
# Version 2.1
# For latest version, see: http://stackoverflow.com/questions/49478/git-ignore-file-for-xcode-projects
#
# 2013 updates:
# - fixed the broken "save personal Schemes"
# - added line-by-line explanations for EVERYTHING (some were missing)
#
# NB: if you are storing "built" products, this WILL NOT WORK,
# and you should use a different .gitignore (or none at all)
# This file is for SOURCE projects, where there are many extra
# files that we want to exclude
#
#########################

#####
# OS X temporary files that should never be committed
#
# c.f. http://www.westwind.com/reference/os-x/invisibles.html

.DS_Store

# Xcode
# c.f. http://www.westwind.com/reference/os-x/invisibles.html

.Trashes

# c.f. http://www.westwind.com/reference/os-x/invisibles.html

*.swp

# *.lock - this is used and abused by many editors for many different things.
# For the main ones I use (e.g. Eclipse), it should be excluded
# from source-control, but YMMV

*.lock

# ... but don't ignore the Podfile.lock or the Pods/Manifest.lock file
!Podfile.lock
!Pods/Manifest.lock

#
# profile - REMOVED temporarily (on double-checking, this seems incorrect; I can't find it in OS X docs?)
#profile


####
# Xcode temporary files that should never be committed
#
# NB: NIB/XIB files still exist even on Storyboard projects, so we want this...

*~.nib


####
# Xcode build files -
#
# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "DerivedData"

DerivedData/

# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "build"

build/


#####
# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups)
#
# This is complicated:
#
# SOMETIMES you need to put this file in version control.
# Apple designed it poorly - if you use "custom executables", they are
# saved in this file.
# 99% of projects do NOT use those, so they do NOT want to version control this file.
# ..but if you're in the 1%, comment out the line "*.pbxuser"

# .pbxuser: http://lists.apple.com/archives/xcode-users/2004/Jan/msg00193.html

*.pbxuser
!default.pbxuser

# .mode1v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html

*.mode1v3
!default.mode1v3

# .mode2v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html

*.mode2v3
!default.mode2v3

# .perspectivev3: http://stackoverflow.com/questions/5223297/xcode-projects-what-is-a-perspectivev3-file

*.perspectivev3

# NB: also, whitelist the default ones, some projects need to use these
!default.pbxuser
!default.mode1v3
!default.mode2v3
!default.perspectivev3


####
# Xcode 4 - semi-personal settings
#
#
# OPTION 1: ---------------------------------
# throw away ALL personal settings (including custom schemes!
# - unless they are "shared")
#
# NB: this is exclusive with OPTION 2 below
xcuserdata
*.xccheckout
profile

# OPTION 2: ---------------------------------
# get rid of ALL personal settings, but KEEP SOME OF THEM
# - NB: you must manually uncomment the bits you want to keep
#
# NB: this *requires* git v1.8.2 or above; you may need to upgrade to latest OS X,
# or manually install git over the top of the OS X version
# NB: this is exclusive with OPTION 1 above
#
#xcuserdata/**/*

# (requires option 2 above): Personal Schemes
#
#!xcuserdata/**/xcschemes/*

####
# XCode 4 workspaces - more detailed
#
# Workspaces are important! They are a core feature of Xcode - don't exclude them :)
#
# Workspace layout is quite spammy. For reference:
#
# /(root)/
# /(project-name).xcodeproj/
# project.pbxproj
# /project.xcworkspace/
# contents.xcworkspacedata
# /xcuserdata/
# /(your name)/xcuserdatad/
# UserInterfaceState.xcuserstate
# /xcsshareddata/
# /xcschemes/
# (shared scheme name).xcscheme
# /xcuserdata/
# /(your name)/xcuserdatad/
# (private scheme).xcscheme
# xcschememanagement.plist
#
#

####
# Xcode 4 - Deprecated classes
#
# Allegedly, if you manually "deprecate" your classes, they get moved here.
#
# We're using source-control, so this is a "feature" that we do not want!

*.moved-aside
DerivedData
*.hmap
*.ipa

# CocoaPods
Pods
####
# UNKNOWN: recommended by others, but I can't discover what these files are
#
# ...none. Everything is now explained.


# Also, ignore .xccheckout files, as they contain data about specific paths and remotes that doesn't feel right in the repo. -igreensp 20131230
*.xccheckout
2 changes: 1 addition & 1 deletion Cat2Cat.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Cat2Cat"
s.version = '1.1.2'
s.version = '1.2.0'
s.summary = "Cat2Cat - Asset Catalog -> Image Category"
s.description = <<-DESC
A utility to take AssetCatalogs and turn them into UIImage or NSImage categories.
Expand Down
79 changes: 79 additions & 0 deletions Cat2Cat.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
337C73DF188472F90078E5F8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 337C73DC188472F90078E5F8 /* main.m */; };
337C73E0188472F90078E5F8 /* VICatalogWalker.m in Sources */ = {isa = PBXBuildFile; fileRef = 337C73DE188472F90078E5F8 /* VICatalogWalker.m */; };
338287BE18773EC500070BE8 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 338287BD18773EC500070BE8 /* Foundation.framework */; };
71FF00E11A003B4200B3F38D /* VOKTemplateModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 71FF00E01A003B3E00B3F38D /* VOKTemplateModel.m */; };
71FF00E41A003B5600B3F38D /* VOKAssetCatalogFolderModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 71FF00E31A003B5600B3F38D /* VOKAssetCatalogFolderModel.m */; };
71FF00E71A003B6000B3F38D /* VOKAssetCatalogImageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 71FF00E61A003B6000B3F38D /* VOKAssetCatalogImageModel.m */; };
EE0247AB4CA61B20873E6415 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D1E1AA0184C17C96B870929 /* libPods.a */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
Expand All @@ -25,6 +29,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
0D1E1AA0184C17C96B870929 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
337C73DA188472E30078E5F8 /* Cat2Cat-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Cat2Cat-Prefix.pch"; path = "Cat2Cat/Cat2Cat-Prefix.pch"; sourceTree = SOURCE_ROOT; };
337C73DB188472F00078E5F8 /* Cat2Cat.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; name = Cat2Cat.1; path = Cat2Cat/Cat2Cat.1; sourceTree = SOURCE_ROOT; };
337C73DC188472F90078E5F8 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Cat2Cat/main.m; sourceTree = SOURCE_ROOT; };
Expand All @@ -33,6 +38,14 @@
338287BA18773EC500070BE8 /* Cat2Cat */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Cat2Cat; sourceTree = BUILT_PRODUCTS_DIR; };
338287BD18773EC500070BE8 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
33B0A501188089A20058939D /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.md; sourceTree = SOURCE_ROOT; };
71FF00DF1A003B3E00B3F38D /* VOKTemplateModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VOKTemplateModel.h; sourceTree = "<group>"; };
71FF00E01A003B3E00B3F38D /* VOKTemplateModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VOKTemplateModel.m; sourceTree = "<group>"; };
71FF00E21A003B5600B3F38D /* VOKAssetCatalogFolderModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VOKAssetCatalogFolderModel.h; sourceTree = "<group>"; };
71FF00E31A003B5600B3F38D /* VOKAssetCatalogFolderModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VOKAssetCatalogFolderModel.m; sourceTree = "<group>"; };
71FF00E51A003B6000B3F38D /* VOKAssetCatalogImageModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VOKAssetCatalogImageModel.h; sourceTree = "<group>"; };
71FF00E61A003B6000B3F38D /* VOKAssetCatalogImageModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VOKAssetCatalogImageModel.m; sourceTree = "<group>"; };
D92AAE9B5CFD31F7884B4371 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
DA441151F5E8154C5647C333 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -41,6 +54,7 @@
buildActionMask = 2147483647;
files = (
338287BE18773EC500070BE8 /* Foundation.framework in Frameworks */,
EE0247AB4CA61B20873E6415 /* libPods.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -53,6 +67,7 @@
338287BF18773EC500070BE8 /* ImageNamer */,
338287BC18773EC500070BE8 /* Frameworks */,
338287BB18773EC500070BE8 /* Products */,
EB0EBE335A298BE14F0158BF /* Pods */,
);
sourceTree = "<group>";
};
Expand All @@ -68,6 +83,7 @@
isa = PBXGroup;
children = (
338287BD18773EC500070BE8 /* Foundation.framework */,
0D1E1AA0184C17C96B870929 /* libPods.a */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -79,6 +95,7 @@
337C73DC188472F90078E5F8 /* main.m */,
337C73DD188472F90078E5F8 /* VICatalogWalker.h */,
337C73DE188472F90078E5F8 /* VICatalogWalker.m */,
71FF00DE1A003B3E00B3F38D /* Templating */,
337C73DB188472F00078E5F8 /* Cat2Cat.1 */,
338287C218773EC500070BE8 /* Supporting Files */,
);
Expand All @@ -93,16 +110,40 @@
name = "Supporting Files";
sourceTree = "<group>";
};
71FF00DE1A003B3E00B3F38D /* Templating */ = {
isa = PBXGroup;
children = (
71FF00E21A003B5600B3F38D /* VOKAssetCatalogFolderModel.h */,
71FF00E31A003B5600B3F38D /* VOKAssetCatalogFolderModel.m */,
71FF00E51A003B6000B3F38D /* VOKAssetCatalogImageModel.h */,
71FF00E61A003B6000B3F38D /* VOKAssetCatalogImageModel.m */,
71FF00DF1A003B3E00B3F38D /* VOKTemplateModel.h */,
71FF00E01A003B3E00B3F38D /* VOKTemplateModel.m */,
);
path = Templating;
sourceTree = SOURCE_ROOT;
};
EB0EBE335A298BE14F0158BF /* Pods */ = {
isa = PBXGroup;
children = (
D92AAE9B5CFD31F7884B4371 /* Pods.debug.xcconfig */,
DA441151F5E8154C5647C333 /* Pods.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
338287B918773EC500070BE8 /* Cat2Cat */ = {
isa = PBXNativeTarget;
buildConfigurationList = 338287C818773EC500070BE8 /* Build configuration list for PBXNativeTarget "Cat2Cat" */;
buildPhases = (
6F5AE2AA5307198823F4D6CC /* Check Pods Manifest.lock */,
338287B618773EC500070BE8 /* Sources */,
338287B718773EC500070BE8 /* Frameworks */,
338287B818773EC500070BE8 /* CopyFiles */,
1464D5E34813F8ECCF73ABC8 /* Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -139,13 +180,49 @@
};
/* End PBXProject section */

/* Begin PBXShellScriptBuildPhase section */
1464D5E34813F8ECCF73ABC8 /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
showEnvVarsInLog = 0;
};
6F5AE2AA5307198823F4D6CC /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
338287B618773EC500070BE8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
71FF00E71A003B6000B3F38D /* VOKAssetCatalogImageModel.m in Sources */,
337C73E0188472F90078E5F8 /* VICatalogWalker.m in Sources */,
337C73DF188472F90078E5F8 /* main.m in Sources */,
71FF00E11A003B4200B3F38D /* VOKTemplateModel.m in Sources */,
71FF00E41A003B5600B3F38D /* VOKAssetCatalogFolderModel.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -222,6 +299,7 @@
};
338287C918773EC500070BE8 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D92AAE9B5CFD31F7884B4371 /* Pods.debug.xcconfig */;
buildSettings = {
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Cat2Cat/Cat2Cat-Prefix.pch";
Expand All @@ -231,6 +309,7 @@
};
338287CA18773EC500070BE8 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DA441151F5E8154C5647C333 /* Pods.release.xcconfig */;
buildSettings = {
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Cat2Cat/Cat2Cat-Prefix.pch";
Expand Down
10 changes: 10 additions & 0 deletions Cat2Cat.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Cat2Cat/VICatalogWalker.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
typedef NS_ENUM(NSInteger, VICatalogWalkerOutputType) {
VICatalogWalkerOutputTypeiOSAndMac = 0,
VICatalogWalkerOutputTypeiOSOnly = 1,
VICatalogWalkerOutputTypeMacOnly = 2
VICatalogWalkerOutputTypeMacOnly = 2,
VICatalogWalkerOutputTypeSwiftiOSAndMac = 3,
VICatalogWalkerOutputTypeSwiftiOSOnly = 4,
VICatalogWalkerOutputTypeSwiftMacOnly = 5,
};

@interface VICatalogWalker : NSObject
Expand Down
Loading

0 comments on commit c2afbae

Please sign in to comment.