Merge pull request #13 from dmiedema/ModuloFileSettings

[WIP] Modulo file settings

Author: woolie

.gitignore

@@ -2,6 +2,7 @@
 
 ## Build generated
 build/
+.build/
 DerivedData/
 
 ## Various settings

Makefile

@@ -0,0 +1,41 @@
+# By default export all variables
+export
+
+.PHONY: install release debug build setup clean
+
+PROJECT ?= 'modulo.xcodeproj'
+SCHEME  ?= 'modulo'
+SYMROOT ?= 'build'
+CONFIGURATION ?= 'Debug'
+
+# Build for debugging
+debug: build
+
+# Install `modulo` to `/usr/local/bin`
+install: release
+	cp $(SYMROOT)/Release/modulo /usr/local/bin/
+
+# Build for release
+release: CONFIGURATION = 'Release'
+release: build
+
+
+# Build modulo
+# This will build the `PROJECT` with the given `SCHEME`
+# to the `SYMROOT` with a given `CONFIGURATION`
+# Defaults for these values are
+# `PROJECT` - `modulo.xcodeproj`
+# `SCHEME`  - `modulo`
+# `SYMROOM` - `build`
+# `CONFIGURATION` - `Debug`
+# 
+# These can be overwritten via ENV variables.
+build: setup
+	xcodebuild -project $(PROJECT) -scheme $(SCHEME) -configuration $(CONFIGURATION) SYMROOT=$(SYMROOT)
+
+# Setup the environment
+setup:
+	mkdir -p $(SYMROOT)
+
+clean:
+	rm -rfv $(SYMROOT)

ModuloKit/Commands/AddCommand.swift

@@ -31,7 +31,7 @@ open class AddCommand: NSObject, Command {
     }
     open var failOnUnrecognizedOptions: Bool { return true }
 
-    open var verbose: Bool = false
+    open var verbose: Bool = State.instance.options.verboseOutput
     open var quiet: Bool = false
 
     open func configureOptions() {

ModuloKit/Commands/DefaultsCommand.swift

@@ -0,0 +1,101 @@
+//
+//  DefaultsCommand.swift
+//  ModuloKit
+//
+//  Created by Daniel Miedema on 9/25/18.
+//  Copyright © 2018 TheHolyGrail. All rights reserved.
+//
+
+import Foundation
+#if NOFRAMEWORKS
+#else
+    import ELCLI
+#endif
+
+open class DefaultsCommand: NSObject, Command {
+    // Internal Properties
+    fileprivate var toggleVerbose: Bool = false
+    fileprivate var verboseValue: String? = nil
+    fileprivate var moduleFolderPath: String? = nil
+    fileprivate var setValue: Bool = false
+
+    // Protocol Conformance
+    public var name: String { return "defaults" }
+
+    public var shortHelpDescription: String {
+        return "Set default arguments/configuration properties for this repository"
+    }
+
+    public var longHelpDescription: String {
+        return """
+        Set default argument values for all commands to be run.
+        This will make changes to the `.modulo` file reflecting the
+        new defaults that have been set
+        """
+    }
+
+    public var failOnUnrecognizedOptions: Bool { return true }
+
+    public var verbose: Bool = State.instance.options.verboseOutput
+    public var quiet: Bool = false
+
+    public func execute(_ otherParams: Array<String>?) -> Int {
+        guard var spec = ModuleSpec.workingSpec() else {
+            exit(ErrorCode.notInitialized)
+            return ErrorCode.notInitialized.rawValue
+        }
+
+        if setValue {
+            if toggleVerbose {
+                let newValue: Bool
+                switch verboseValue {
+                case "true":
+                    newValue = true
+                case "false":
+                    newValue = false
+                default:
+                    writeln(.stderr, "\(verboseValue ?? "") is not `true` or `false`. Interpretting as `false`.")
+                    newValue = false
+                }
+
+                spec.options.verboseOutput = newValue
+                State.instance.options.verboseOutput = newValue
+            }
+            if let moduleFolderPath = moduleFolderPath,
+                !moduleFolderPath.isEmpty {
+                spec.options.depdencyInstallationPath = moduleFolderPath
+                State.instance.options.depdencyInstallationPath = moduleFolderPath
+            }
+            spec.save()
+        } else {
+            if toggleVerbose {
+                writeln(.stdout, "VerboseOutput - \(spec.options.verboseOutput)")
+            }
+            if moduleFolderPath != nil {
+                writeln(.stdout, "depdencyInstallationPath - \(spec.options.depdencyInstallationPath)")
+            }
+
+        }
+
+        return ErrorCode.success.rawValue
+    }
+
+    open func configureOptions() {
+        addOption(["--set"], usage: "set a new value for the given") { (option, value) in
+            self.setValue = true
+        }
+
+        addOptionValue(["--verboseOutput"],
+            usage: "specify `verbose` for all commands that are run",
+            valueSignature: "<[true|false}>") { (option, value) in
+            self.toggleVerbose = true
+            self.verboseValue = value
+        }
+
+        addOptionValue(["--moduleFolder"],
+           usage: "specify the desired dependency path",
+           valueSignature: "<path>") { (option, value) in
+            self.moduleFolderPath = value ?? ""
+        }
+    }
+}

ModuloKit/Commands/InitCommand.swift

@@ -25,7 +25,7 @@ open class InitCommand: NSObject, Command {
     }
     open var failOnUnrecognizedOptions: Bool { return true }
 
-    open var verbose: Bool = false
+    open var verbose: Bool = State.instance.options.verboseOutput
     open var quiet: Bool = false
 
     open func configureOptions() {
@@ -53,7 +53,7 @@ open class InitCommand: NSObject, Command {
         }
 
         let specPath = workingPath.appendPathComponent(specFilename)
-        let spec = ModuleSpec(name: FileManager.directoryName(), module: isModule, sourcePath: nil, dependencies: [], path: specPath)
+        let spec = ModuleSpec(name: FileManager.directoryName(), module: isModule, sourcePath: nil, dependencies: [], options: OptionsSpec(), path: specPath)
         let success = spec.save()
 
         if !success {

ModuloKit/Commands/MapCommand.swift

@@ -21,7 +21,7 @@ open class MapCommand: NSObject, Command {
     }
     open var failOnUnrecognizedOptions: Bool { return true }
 
-    open var verbose: Bool = false
+    open var verbose: Bool = State.instance.options.verboseOutput
     open var quiet: Bool = false
 
     fileprivate var simple = false

ModuloKit/Commands/RemoveCommand.swift

@@ -21,7 +21,7 @@ open class RemoveCommand: NSObject, Command {
     }
     open var failOnUnrecognizedOptions: Bool { return true }
 
-    open var verbose: Bool = false
+    open var verbose: Bool = State.instance.options.verboseOutput
     open var quiet: Bool = false
 
     open func configureOptions() {

ModuloKit/Commands/SetCommand.swift

@@ -21,7 +21,7 @@ open class SetCommand: NSObject, Command {
     }
     open var failOnUnrecognizedOptions: Bool { return true }
 
-    open var verbose: Bool = false
+    open var verbose: Bool = State.instance.options.verboseOutput
     open var quiet: Bool = false
 
     // subcommands

ModuloKit/Commands/StatusCommand.swift

@@ -23,7 +23,7 @@ open class StatusCommand: NSObject, Command {
     open var failOnUnrecognizedOptions: Bool { return true }
     open var ignoreMain: Bool = false
 
-    open var verbose: Bool = false
+    open var verbose: Bool = State.instance.options.verboseOutput
     open var quiet: Bool = false
 
     open func configureOptions() {

ModuloKit/Commands/UpdateCommand.swift

@@ -29,7 +29,7 @@ open class UpdateCommand: NSObject, Command {
     }
     open var failOnUnrecognizedOptions: Bool { return true }
 
-    open var verbose: Bool = false
+    open var verbose: Bool = State.instance.options.verboseOutput
     open var quiet: Bool = false
 
     open func configureOptions() {