Skip to content

Commit

Permalink
Merge pull request #655 from lindegroup/1.5.5-dev
Browse files Browse the repository at this point in the history
1.5.5 dev
  • Loading branch information
shawnhonsberger authored Sep 22, 2020
2 parents c442612 + 1e251f9 commit d6dfcdb
Show file tree
Hide file tree
Showing 27 changed files with 674 additions and 134 deletions.
36 changes: 32 additions & 4 deletions AutoPkgr.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
295D7358247336C1008B796A /* LGMicrosoftTeamsNotificationView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 295D7354247336C1008B796A /* LGMicrosoftTeamsNotificationView.xib */; };
295D7359247336C1008B796A /* LGMicrosoftTeamsNotificationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 295D7356247336C1008B796A /* LGMicrosoftTeamsNotificationView.m */; };
295D735C24733742008B796A /* LGMicrosoftTeamsNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 295D735A24733742008B796A /* LGMicrosoftTeamsNotification.m */; };
2974CFA124E703B400EC0647 /* LGSimpleMDMIntegration.m in Sources */ = {isa = PBXBuildFile; fileRef = 2974CFA024E703B400EC0647 /* LGSimpleMDMIntegration.m */; };
2974CFA424E704A600EC0647 /* LGSimpleMDMIntegrationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2974CFA324E704A600EC0647 /* LGSimpleMDMIntegrationView.m */; };
2974CFA724E704DC00EC0647 /* LGSimpleMDMIntegrationView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2974CFA524E704DC00EC0647 /* LGSimpleMDMIntegrationView.xib */; };
29E9D06525019A56007D9509 /* munkichoices.xml in Resources */ = {isa = PBXBuildFile; fileRef = 29E9D06425019A55007D9509 /* munkichoices.xml */; };
5EF53CBDA5C7106F3847E9FD /* libPods-AutoPkgrTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B419CA189BE572FD31F74E0 /* libPods-AutoPkgrTests.a */; };
6A53625D1988BE59008A949C /* LGTestPort.m in Sources */ = {isa = PBXBuildFile; fileRef = 6A53625C1988BE59008A949C /* LGTestPort.m */; };
8B1AF8521BED81440013BE37 /* LGFileWaveIntegrationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B1AF8501BED81440013BE37 /* LGFileWaveIntegrationView.m */; };
Expand Down Expand Up @@ -329,6 +333,12 @@
295D7356247336C1008B796A /* LGMicrosoftTeamsNotificationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGMicrosoftTeamsNotificationView.m; sourceTree = "<group>"; };
295D735A24733742008B796A /* LGMicrosoftTeamsNotification.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGMicrosoftTeamsNotification.m; sourceTree = "<group>"; };
295D735B24733742008B796A /* LGMicrosoftTeamsNotification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGMicrosoftTeamsNotification.h; sourceTree = "<group>"; };
2974CF9F24E703B400EC0647 /* LGSimpleMDMIntegration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGSimpleMDMIntegration.h; sourceTree = "<group>"; };
2974CFA024E703B400EC0647 /* LGSimpleMDMIntegration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGSimpleMDMIntegration.m; sourceTree = "<group>"; };
2974CFA224E704A600EC0647 /* LGSimpleMDMIntegrationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGSimpleMDMIntegrationView.h; sourceTree = "<group>"; };
2974CFA324E704A600EC0647 /* LGSimpleMDMIntegrationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGSimpleMDMIntegrationView.m; sourceTree = "<group>"; };
2974CFA624E704DC00EC0647 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LGSimpleMDMIntegrationView.xib; sourceTree = "<group>"; };
29E9D06425019A55007D9509 /* munkichoices.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = munkichoices.xml; sourceTree = "<group>"; };
2C6986FE5B41226735CC0A32 /* Pods-AutoPkgr.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AutoPkgr.debug.xcconfig"; path = "Pods/Target Support Files/Pods-AutoPkgr/Pods-AutoPkgr.debug.xcconfig"; sourceTree = "<group>"; };
39CF6FA5E75D62254A994C22 /* libPods-AutoPkgr.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-AutoPkgr.a"; sourceTree = BUILT_PRODUCTS_DIR; };
45E6F02919946C3F73535515 /* Pods-AutoPkgrTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AutoPkgrTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-AutoPkgrTests/Pods-AutoPkgrTests.release.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -847,6 +857,7 @@
1AC98423195DF6270071CAB3 /* Resources */ = {
isa = PBXGroup;
children = (
29E9D06425019A55007D9509 /* munkichoices.xml */,
1AC69568195B59EE00D2BD81 /* Images.xcassets */,
1A2C7FAC19CC9F8300CFF472 /* scripts */,
8BB217F519709A2C00EF8B93 /* AutoPkgrIcon.png */,
Expand Down Expand Up @@ -1173,6 +1184,9 @@
8B8654BC1CF6695F00B0A3FD /* LGFileWaveIntegrationView.xib */,
BE32B0351B2735DF0071778B /* LGGitIntegrationView.h */,
BE32B0361B2735DF0071778B /* LGGitIntegrationView.m */,
2974CFA224E704A600EC0647 /* LGSimpleMDMIntegrationView.h */,
2974CFA324E704A600EC0647 /* LGSimpleMDMIntegrationView.m */,
2974CFA524E704DC00EC0647 /* LGSimpleMDMIntegrationView.xib */,
8BD9E7961C8E296A00BCB399 /* LGVirusTotalAnalyzerIntegrationView.h */,
8BD9E7971C8E296A00BCB399 /* LGVirusTotalAnalyzerIntegrationView.m */,
8B8654C31CF669A100B0A3FD /* LGVirusTotalAnalyzerIntegrationView.xib */,
Expand Down Expand Up @@ -1325,6 +1339,8 @@
BE2337C91B3E42EC00256F85 /* LGMacPatchIntegration.m */,
BE4DD53A1B11740900854FD8 /* LGMunkiIntegration.h */,
BE4DD53D1B11743700854FD8 /* LGMunkiIntegration.m */,
2974CF9F24E703B400EC0647 /* LGSimpleMDMIntegration.h */,
2974CFA024E703B400EC0647 /* LGSimpleMDMIntegration.m */,
8BD9E78D1C8E16F000BCB399 /* LGVirusTotalAnalyzerIntegration.h */,
8BD9E78E1C8E16F000BCB399 /* LGVirusTotalAnalyzerIntegration.m */,
);
Expand Down Expand Up @@ -1479,6 +1495,7 @@
8B8654CF1CF66B8E00B0A3FD /* LGJSSImporterIntegrationView.xib in Resources */,
8B8654871CF64CA400B0A3FD /* LGRecipeReposViewController.xib in Resources */,
8B8655001CF66F7400B0A3FD /* LGRecipeSearchResultsPanel.xib in Resources */,
2974CFA724E704DC00EC0647 /* LGSimpleMDMIntegrationView.xib in Resources */,
8B8655151CF6719F00B0A3FD /* LGViewWindowController.xib in Resources */,
8B8654801CF64A9600B0A3FD /* LGInstallViewController.xib in Resources */,
8B8654C81CF66B0F00B0A3FD /* LGGitIntegrationView.xib in Resources */,
Expand All @@ -1492,6 +1509,7 @@
8B86550E1CF670DA00B0A3FD /* LGSelectNotificationsWindowController.xib in Resources */,
8B8654F91CF66F1800B0A3FD /* LGJSSDistributionPointsPrefPanel.xib in Resources */,
8B86548E1CF64EE500B0A3FD /* LGScheduleViewController.xib in Resources */,
29E9D06525019A56007D9509 /* munkichoices.xml in Resources */,
8B8654F21CF66EB500B0A3FD /* LGTemplateRenderWindowController.xib in Resources */,
8B8654A51CF665DF00B0A3FD /* LGAbsoluteManageIntegrationView.xib in Resources */,
295D7358247336C1008B796A /* LGMicrosoftTeamsNotificationView.xib in Resources */,
Expand Down Expand Up @@ -2448,6 +2466,7 @@
BEEFE6CA1AEC760700882C89 /* LGAutoPkgIntegration.m in Sources */,
BE59D8971B61998D0037F3CA /* BSDProcessInfo.m in Sources */,
BEC1258919F046FA006696C4 /* main.m in Sources */,
2974CFA124E703B400EC0647 /* LGSimpleMDMIntegration.m in Sources */,
BED136B71AC3BE04003EBF0F /* NSArray+html_report.m in Sources */,
BEEFE6BB1AE9E8A600882C89 /* LGLogger.m in Sources */,
BE4DD53E1B11743700854FD8 /* LGMunkiIntegration.m in Sources */,
Expand All @@ -2470,6 +2489,7 @@
BE344F551ABFBEAB00500AAE /* LGAutoPkgReport.m in Sources */,
BE38EA8E1B0CFE68009FCBEB /* LGInstallViewController.m in Sources */,
295D735C24733742008B796A /* LGMicrosoftTeamsNotification.m in Sources */,
2974CFA424E704A600EC0647 /* LGSimpleMDMIntegrationView.m in Sources */,
BE38EA951B0CFE95009FCBEB /* LGRecipeReposViewController.m in Sources */,
1AC86D3D195E0AC6006FDD2B /* LGHostInfo.m in Sources */,
BEC1258719F0465F006696C4 /* LGAutoPkgTask.m in Sources */,
Expand Down Expand Up @@ -2693,6 +2713,14 @@
path = .;
sourceTree = "<group>";
};
2974CFA524E704DC00EC0647 /* LGSimpleMDMIntegrationView.xib */ = {
isa = PBXVariantGroup;
children = (
2974CFA624E704DC00EC0647 /* Base */,
);
name = LGSimpleMDMIntegrationView.xib;
sourceTree = "<group>";
};
8B8654821CF64A9600B0A3FD /* LGInstallViewController.xib */ = {
isa = PBXVariantGroup;
children = (
Expand Down Expand Up @@ -3117,8 +3145,8 @@
GCC_PREFIX_HEADER = "AutoPkgr/Supporting Files/AutoPkgr-Prefix.pch";
INFOPLIST_FILE = "AutoPkgr/Supporting Files/AutoPkgr-Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
MARKETING_VERSION = 1.5.4;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 1.5.5;
OTHER_CODE_SIGN_FLAGS = "";
"OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -3181,8 +3209,8 @@
GCC_PREFIX_HEADER = "AutoPkgr/Supporting Files/AutoPkgr-Prefix.pch";
INFOPLIST_FILE = "AutoPkgr/Supporting Files/AutoPkgr-Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
MARKETING_VERSION = 1.5.4;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 1.5.5;
OTHER_CODE_SIGN_FLAGS = "";
"OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--options=runtime";
OTHER_LDFLAGS = (
Expand Down
78 changes: 78 additions & 0 deletions AutoPkgr.xcodeproj/xcshareddata/xcschemes/AutoPkgr.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1160"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1AC6954C195B59ED00D2BD81"
BuildableName = "AutoPkgr.app"
BlueprintName = "AutoPkgr"
ReferencedContainer = "container:AutoPkgr.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1AC6954C195B59ED00D2BD81"
BuildableName = "AutoPkgr.app"
BlueprintName = "AutoPkgr"
ReferencedContainer = "container:AutoPkgr.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1AC6954C195B59ED00D2BD81"
BuildableName = "AutoPkgr.app"
BlueprintName = "AutoPkgr"
ReferencedContainer = "container:AutoPkgr.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
7 changes: 3 additions & 4 deletions AutoPkgr/Models/AutoPkg Task/LGAutoPkgRecipe.m
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,9 @@ - (void)setEnabled:(BOOL)enabled
{
/* We automatically handle the enabling of the MakeCatalogs recipe
* so don't do anything if that's the one getting enabled. */
if ([self.Name isEqualToString:kLGMakeCatalogsRecipeName]) {
return;
}
//if ([self.Name isEqualToString:kLGMakeCatalogsRecipeName]) {
//return;
//}

/* This is all dispatched to a serial queue so a race condition doesn't raise
* when multiple recipes are added or removed in rapid succession. */
Expand Down Expand Up @@ -218,7 +218,6 @@ - (void)setEnabled:(BOOL)enabled
* now listed. If so re-add the MakeCatalogs recipe. */
[currentList enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
if ([obj rangeOfString:@"munki"].location != NSNotFound) {
[currentList addObject:kLGMakeCatalogsRecipeName];
*stop = YES;
}
}];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ @implementation LGGoogleHangoutsNotification
#pragma mark - Protocol Conforming
+ (NSString *)serviceDescription
{
return @"AutoPkgr Google Hangouts";
return @"AutoPkgr Google Chat";
}

+ (BOOL)reportsIntegrations
Expand All @@ -52,7 +52,7 @@ + (BOOL)storesInfoInKeychain

+ (NSString *)account
{
return @"AutoPkgr Google Hangouts Webhook URL";
return @"AutoPkgr Google Chat Webhook URL";
}

+ (NSURL *)serviceURL
Expand All @@ -67,7 +67,12 @@ + (BOOL)templateIsFile

+ (NSString *)defaultTemplate
{
return [self templateWithName:@"web_report" type:@"html"];
return [self templateWithName:@"slack_report" type:@"md"];
}

+ (ACEMode)tempateFormat
{
return ACEModeMarkdown;
}

#pragma mark - Send
Expand All @@ -79,7 +84,7 @@ - (void)send:(void (^)(NSError *))complete

- (void)sendTest:(void (^)(NSError *))complete
{
[self sendMessage:NSLocalizedString(@"You are now set up to receive notifications in your Google Hangouts channel!", nil) title:nil complete:complete];
[self sendMessage:NSLocalizedString(@"You are now set up to receive notifications in your Google Chat room!", nil) title:nil complete:complete];
}

- (void)sendMessage:(NSString *)message title:(NSString *)title complete:(void (^)(NSError *))complete
Expand Down Expand Up @@ -121,7 +126,7 @@ - (void)sendMessageWithParameters:(NSDictionary *)parameters
self.notificatonComplete(nil);
}
failure:^(AFHTTPRequestOperation *operation, NSError *error) {
NSLog(@"Error sending Google Hangouts notification: %@", operation.responseString);
NSLog(@"Error sending Google notification: %@", operation.responseString);
self.notificatonComplete([LGError errorWithResponse:operation.response]);
}];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#import "LGLANrevIntegration.h"
#import "LGMacPatchIntegration.h"
#import "LGMunkiIntegration.h"
#import "LGSimpleMDMIntegration.h"
#import "LGVirusTotalAnalyzerIntegration.h"

@class LGIntegration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ + (void)load
[LGLANrevIntegration class],
[LGMacPatchIntegration class],
[LGMunkiIntegration class],
[LGSimpleMDMIntegration class],
[LGVirusTotalAnalyzerIntegration class],
];

Expand Down
35 changes: 35 additions & 0 deletions AutoPkgr/Models/Integrations/LGSimpleMDMIntegration.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
//
// LGSimpleMDMIntegration.h
// AutoPkgr
//
// Copyright 2020 Shawn Honsberger
//
// 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"
#import "LGConstants.h"
#import "LGIntegration+Protocols.h"
#import "LGIntegration.h"

@interface LGSimpleMDMIntegration : LGIntegration <LGIntegrationSharedProcessor>

@end

@interface LGSimpleMDMDefaults : LGDefaults

@property (copy, nonatomic) NSString *SIMPLEMDM_API_KEY;
@property (copy, nonatomic) NSString *simpleMDMDomainObject;
@property (copy, nonatomic) NSString *setSimpleMDMDomainObject;

@end
Loading

0 comments on commit d6dfcdb

Please sign in to comment.