diff options
| -rwxr-xr-x | bin/leap | 17 | ||||
| -rw-r--r-- | lib/leap_cli/commands/project.rb | 9 | ||||
| -rw-r--r-- | lib/leap_cli/commands/vagrant.rb | 1 | ||||
| -rw-r--r-- | lib/leap_cli/leapfile.rb | 2 |
4 files changed, 14 insertions, 15 deletions
@@ -39,9 +39,7 @@ module LeapCli::Commands extend GLI::App extend Forwardable - # # delegate highline methods to make them available to sub-commands - # @terminal = HighLine.new def_delegator :@terminal, :ask, 'self.ask' def_delegator :@terminal, :agree, 'self.agree' @@ -50,9 +48,7 @@ module LeapCli::Commands def_delegator :@terminal, :color, 'self.color' def_delegator :@terminal, :list, 'self.list' - # # make config manager available as 'manager' - # def self.manager @manager ||= begin manager = LeapCli::Config::Manager.new @@ -61,30 +57,27 @@ module LeapCli::Commands end end - # # make provider config available as 'provider' - # def self.provider manager.provider end - # + # make leapfile available as 'leapfile' + def self.leapfile + LeapCli::leapfile + end + # info about leap command line suite - # program_desc LeapCli::SUMMARY program_long_desc LeapCli::DESCRIPTION - # # handle --version ourselves - # if ARGV.grep(/--version/).any? puts "leap #{LeapCli::VERSION}, ruby #{RUBY_VERSION}" exit(0) end - # # load commands and run - # commands_from('leap_cli/commands') exit run(ARGV) end diff --git a/lib/leap_cli/commands/project.rb b/lib/leap_cli/commands/project.rb index 2f36bc5..12d159b 100644 --- a/lib/leap_cli/commands/project.rb +++ b/lib/leap_cli/commands/project.rb @@ -61,10 +61,13 @@ module LeapCli; module Commands end def leapfile_content(options) - %[@platform_directory_path = "#{options[:platform]}" + %[## Required: +@platform_directory_path = "#{options[:platform]}" +@leap_version = "#{LeapCli::VERSION}" + +## Optional: +# @custom_vagrant_vm_line = "config.vm.boot_mode = :gui" ] - # leap_version = "#{LeapCli::VERSION}" - # platform_version = "" end GITIGNORE_CONTENT = <<EOS diff --git a/lib/leap_cli/commands/vagrant.rb b/lib/leap_cli/commands/vagrant.rb index dfa32f2..02f47a4 100644 --- a/lib/leap_cli/commands/vagrant.rb +++ b/lib/leap_cli/commands/vagrant.rb @@ -113,6 +113,7 @@ module LeapCli; module Commands lines << %[ config.vm.box_url = "http://cloud.github.com/downloads/leapcode/minimal-debian-vagrant/leap-wheezy.box"] lines << %[ config.vm.network :hostonly, "#{node.ip_address}", :netmask => "#{netmask}"] lines << %[ config.vm.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]] + lines << %[ #{leapfile.custom_vagrant_vm_line}] if leapfile.custom_vagrant_vm_line lines << %[ end] end end diff --git a/lib/leap_cli/leapfile.rb b/lib/leap_cli/leapfile.rb index 2559864..f369c9a 100644 --- a/lib/leap_cli/leapfile.rb +++ b/lib/leap_cli/leapfile.rb @@ -12,6 +12,8 @@ module LeapCli class Leapfile attr_accessor :platform_directory_path attr_accessor :provider_directory_path + attr_accessor :custom_vagrant_vm_line + attr_accessor :leap_version def load directory = File.expand_path(find_in_directory_tree('Leapfile')) |