Skip to content

Commit

Permalink
Merge pull request #164 from lindegroup/v1.1-rc2
Browse files Browse the repository at this point in the history
Merge to master in preparation for 1.1 release.
  • Loading branch information
homebysix committed Oct 22, 2014
2 parents 61749f6 + 591e1be commit d34c824
Show file tree
Hide file tree
Showing 70 changed files with 3,762 additions and 1,261 deletions.
54 changes: 54 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
---
Language: Cpp
AccessModifierOffset: -4
ConstructorInitializerIndentWidth: 4
AlignEscapedNewlinesLeft: true
AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AlwaysBreakTemplateDeclarations: false
AlwaysBreakBeforeMultilineStrings: false
BreakBeforeBinaryOperators: true
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: true
BinPackParameters: true
ColumnLimit: 0
ConstructorInitializerAllOnOneLineOrOnePerLine: false
DerivePointerBinding: false
ExperimentalAutoDetectBinPacking: false
IndentCaseLabels: false
MaxEmptyLinesToKeep: 1
KeepEmptyLinesAtTheStartOfBlocks: true
NamespaceIndentation: Inner
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakString: 1000
PenaltyBreakFirstLessLess: 120
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerBindsToType: false
SpacesBeforeTrailingComments: 1
Cpp11BracedListStyle: false
Standard: Cpp03
IndentWidth: 4
TabWidth: 8
UseTab: Never
BreakBeforeBraces: Linux
IndentFunctionDeclarationAfterType: false
SpacesInParentheses: false
SpacesInAngles: false
SpaceInEmptyParentheses: false
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: true
SpaceBeforeAssignmentOperators: true
ContinuationIndentWidth: 4
CommentPragmas: '^ IWYU pragma:'
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
SpaceBeforeParens: ControlStatements
DisableFormat: false
...
202 changes: 144 additions & 58 deletions AutoPkgr.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions AutoPkgr.xcworkspace/xcshareddata/AutoPkgr.xccheckout
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,29 @@
<string>AutoPkgr</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>540ED53D-E2BD-4E89-B7A2-52E63D5288B4</key>
<key>941A3B01BA9BA1841C1477B8E57AB717E0D7F561</key>
<string>https://github.com/lindegroup/autopkgr.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>AutoPkgr.xcworkspace</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>540ED53D-E2BD-4E89-B7A2-52E63D5288B4</key>
<key>941A3B01BA9BA1841C1477B8E57AB717E0D7F561</key>
<string>..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/lindegroup/autopkgr.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>110</integer>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>540ED53D-E2BD-4E89-B7A2-52E63D5288B4</string>
<string>941A3B01BA9BA1841C1477B8E57AB717E0D7F561</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>540ED53D-E2BD-4E89-B7A2-52E63D5288B4</string>
<string>941A3B01BA9BA1841C1477B8E57AB717E0D7F561</string>
<key>IDESourceControlWCCName</key>
<string>AutoPkgr</string>
</dict>
Expand Down
6 changes: 3 additions & 3 deletions AutoPkgr/AutoPkgr-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.4</string>
<string>1.1-rc2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>386</string>
<string>387</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 The Linde Group, Inc. All rights reserved.</string>
<string>Copyright 2014 The Linde Group, Inc.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion AutoPkgr/Base.lproj/MainMenu.xib
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6245"/>
</dependencies>
Expand Down
33 changes: 33 additions & 0 deletions AutoPkgr/Custom Catagories/LGDefaults+JSSAddon.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
//
// LGDefaults+JSSAddon.h
// AutoPkgr
//
// Created by Eldon on 10/3/14.
//
// Copyright 2014 The Linde Group, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

#import "LGDefaults.h"

#pragma mark - LGDefaults extensions for JSS Addon Interface
@interface LGDefaults (JSSAddon)

@property (copy, nonatomic) NSString *JSSURL;
@property (copy, nonatomic) NSString *JSSAPIUsername;
@property (copy, nonatomic) NSString *JSSAPIPassword;
@property (copy, nonatomic) NSArray *JSSRepos;
@property (assign, nonatomic) BOOL JSSVerifySSL;

@end
83 changes: 83 additions & 0 deletions AutoPkgr/Custom Catagories/LGDefaults+JSSAddon.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
//
// LGDefaults+JSSAddon.m
// AutoPkgr
//
// Created by Eldon on 10/3/14.
//
// Copyright 2014 The Linde Group, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

#import "LGDefaults+JSSAddon.h"

#pragma mark - LGDefaults category implementation for JSS Addon Interface

@implementation LGDefaults (JSSAddon)

- (NSString *)JSSURL
{
return [self autoPkgDomainObject:@"JSS_URL"];
}

- (void)setJSSURL:(NSString *)JSSURL
{
[self setAutoPkgDomainObject:JSSURL forKey:@"JSS_URL"];
}

#pragma mark -
- (NSString *)JSSAPIUsername
{
return [self autoPkgDomainObject:@"API_USERNAME"];
}

- (void)setJSSAPIUsername:(NSString *)JSSAPIUsername
{
[self setAutoPkgDomainObject:JSSAPIUsername forKey:@"API_USERNAME"];
}

#pragma mark -
- (NSString *)JSSAPIPassword
{
return [self autoPkgDomainObject:@"API_PASSWORD"];
}

- (void)setJSSAPIPassword:(NSString *)JSSAPIPassword
{
[self setAutoPkgDomainObject:JSSAPIPassword forKey:@"API_PASSWORD"];
}

#pragma mark -
- (NSArray *)JSSRepos
{
return [self autoPkgDomainObject:@"JSS_REPOS"];
}

- (void)setJSSRepos:(NSArray *)JSSRepos
{
[self setAutoPkgDomainObject:JSSRepos forKey:@"JSS_REPOS"];
}

#pragma mark -
- (BOOL)JSSVerifySSL
{
NSNumber *verifySSL = [self autoPkgDomainObject:@"JSS_VERIFY_SSL"];
return [verifySSL boolValue];
}

- (void)setJSSVerifySSL:(BOOL)JSSVerifySSL
{
[self setAutoPkgDomainObject:@(JSSVerifySSL) forKey:@"JSS_VERIFY_SSL"];
}

@end
36 changes: 36 additions & 0 deletions AutoPkgr/Custom Catagories/NSImage+statusLight.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
//
// LGStatusImage.h
// AutoPkgr
//
// Created by Eldon on 10/6/14.
//
// Copyright 2014 The Linde Group, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

#import <Cocoa/Cocoa.h>

@interface NSImage (statusLight)

+ (instancetype)LGStatusAvaliable;
+ (instancetype)LGStatusPartiallyAvaliable;
+ (instancetype)LGStatusUnavaliable;
+ (instancetype)LGStatusNone;

+ (instancetype)LGStatusNotInstalled;
+ (instancetype)LGStatusUpToDate;
+ (instancetype)LGStatusUpdateAvaliable;
+ (instancetype)LGStatusUnknown;

@end
66 changes: 66 additions & 0 deletions AutoPkgr/Custom Catagories/NSImage+statusLight.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
//
// LGStatusImage.m
// AutoPkgr
//
// Created by Eldon on 10/6/14.
//
// Copyright 2014 The Linde Group, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

#import "NSImage+statusLight.h"

@implementation NSImage (installStatus)

+ (instancetype)LGStatusAvaliable
{
return [self imageNamed:@"NSStatusAvailable"];
}

+ (instancetype)LGStatusPartiallyAvaliable
{
return [self imageNamed:@"NSStatusPartiallyAvailable"];
}

+ (instancetype)LGStatusUnavaliable
{
return [self imageNamed:@"NSStatusUnavailable"];
}

+ (instancetype)LGStatusNone
{
return [self imageNamed:@"NSStatusNone"];
}

+ (instancetype)LGStatusUpToDate
{
return [self LGStatusAvaliable];
}

+ (instancetype)LGStatusNotInstalled
{
return [self LGStatusUnavaliable];
}

+ (instancetype)LGStatusUpdateAvaliable
{
return [self LGStatusPartiallyAvaliable];
}

+ (instancetype)LGStatusUnknown
{
return [self LGStatusNone];
}

@end
36 changes: 36 additions & 0 deletions AutoPkgr/Custom Catagories/NSString+cleaned.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
//
// NSString+cleaned.h
// AutoPkgr
//
// Created by Eldon on 10/4/14.
//
// Copyright 2014 The Linde Group, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

#import <Foundation/Foundation.h>

@interface NSString (cleaned)

/**
* (Custom Category) equivalent to stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]
*/
@property (copy, nonatomic, readonly) NSString *trimmed;

/**
* (Custom Category) convert @"" to nil
*/
@property (copy, nonatomic, readonly) NSString *blankIsNil;

@end
Loading

0 comments on commit d34c824

Please sign in to comment.