bin/forj in forj-1.0.14 vs bin/forj in forj-1.0.15

- old
+ new

@@ -14,12 +14,10 @@ # 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. require 'rubygems' -# require 'debugger' # Use to debug with Ruby < 2.0 -# require 'byebug' # Use to debug with Ruby >= 2.0 require 'bundler/setup' require 'thor' require 'ansi' require 'forj' @@ -43,10 +41,12 @@ # it helps you to create and support your forge. # rubocop:disable ClassLength class ForjThor < Thor class_option :debug, :aliases => '-d', :desc => 'Set debug mode' class_option :verbose, :aliases => '-v', :desc => 'Set verbose mode' + class_option :quiet, :aliases => '-q', :desc => 'Set quiet mode' + class_option :real_quiet, :desc => 'Set REAL quiet mode (errors/fatal only)' class_option :config, :aliases => '-c', :desc => 'Path to a different forj'\ ' config file. By default, use ~/.forj/config.yaml' class_option :lorj_debug, :desc => 'Set lorj debug level verbosity. 1 to 5.'\ 'Default is one.' desc 'help [action]', 'Describe available FORJ actions or one specific action' @@ -176,9 +176,13 @@ method_option :webproxy, :aliases => '-x', :desc => 'Set HTTP/HTTPS proxy setting from'\ ' your cloud' method_option :ca_root_cert, :desc => 'Certificate Authorities file used by'\ ' your compagny to authenticate your intranet servers.' + method_option :disable_lorj, :type => :boolean, + :desc => 'If set, Maestro - gardener (Cloud'\ + ' management) will use internal FOG cloud implementation to build your '\ + 'forge. By default, Maestro gardener delegate this task to Lorj_cloud.' def boot(blueprint, on_or_name, old_accountname = nil, as = nil, old_name = nil) opts = Forj::Settings.common_options(options) require 'boot.rb'