bosh-gen 0.16.2 → 0.17.0

data/Rakefile

@@ -1,3 +1,13 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 
+require "rspec/core/rake_task"
+
+
+desc "Run Tests"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = "spec/unit/**/*_spec.rb"
+  t.rspec_opts = %w(--format progress --color)
+end
+
+task :default => :spec

data/bosh-gen.gemspec

@@ -14,13 +14,15 @@ Gem::Specification.new do |gem|
   gem.name          = "bosh-gen"
   gem.require_paths = ["lib"]
   gem.version       = Bosh::Gen::VERSION
-  
+
   gem.add_dependency "thor"
   gem.add_dependency "bosh_cli"
   gem.add_dependency "bosh_common"
-  
+
+  gem.add_dependency "cyoi", "~> 0.10.0"
+  gem.add_dependency "fog", "~> 1.11"
+  gem.add_dependency "readwritesettings", "~> 3.0"
+
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "minitest", "~> 2.12"
-  gem.add_development_dependency "minitest-colorize"
-  gem.add_development_dependency "guard-minitest"
+  gem.add_development_dependency "rspec-fire"
 end

data/lib/bosh/gen/cli.rb

@@ -2,7 +2,7 @@ require "thor"
 
 # bosh_cli libraries
 module Bosh; end
-require "cli/config" 
+require "cli/config"
 require "cli/core_ext"
 
 require 'bosh/gen/models'
@@ -11,27 +11,19 @@ module Bosh
   module Gen
     class Command < Thor
       include Thor::Actions
-    
+
       desc "new PATH", "Creates a new BOSH release"
-      method_option :s3, :alias => ["--aws"], :type => :boolean, 
-        :desc => "Use AWS S3 bucket for blobstore"
-      method_option :atmos, :type => :boolean, 
-        :desc => "Use EMC ATMOS for blobstore"
-      method_option :swift, :type => :boolean,
-        :desc => "Use OpenStack Swift for blobstore"
       def new(path)
-        flags = { :aws => options["s3"], :atmos => options["atmos"],
-                  :swift => options["swift"]}
         require 'bosh/gen/generators/new_release_generator'
-        Bosh::Gen::Generators::NewReleaseGenerator.start([path, flags])
+        Bosh::Gen::Generators::NewReleaseGenerator.start([path])
       end
-      
+
       desc "package NAME", "Create a new package"
-      method_option :apt, :type => :boolean, 
+      method_option :apt, :type => :boolean,
         :desc => "Create package using debian/ubuntu apt .debs"
-      method_option :dependencies, :aliases => ['-d'], :type => :array, 
+      method_option :dependencies, :aliases => ['-d'], :type => :array,
         :desc => "List of package dependencies"
-      method_option :files,        :aliases => ['-f'], :type => :array, 
+      method_option :files,        :aliases => ['-f'], :type => :array,
         :desc => "List of files copy into release"
       method_option :src,        :aliases => ['-s'], :type => :array,
         :desc => "List of existing sources to use, e.g. --src 'myapp/**/*'"
@@ -48,9 +40,9 @@ module Bosh
             [name, dependencies, files, sources])
         end
       end
-      
+
       desc "source NAME", "Downloads a source item into the named project"
-      method_option :blob, :aliases => ['-b'], :type => :boolean, 
+      method_option :blob, :aliases => ['-b'], :type => :boolean,
         :desc => "Store file in blobstore"
       def source(name, uri)
         flags = { :blob => options[:blob] || false }
@@ -70,9 +62,9 @@ module Bosh
         Bosh::Gen::Generators::PackageSourceGenerator.start(
           [name, files, flags])
       end
-      
+
       desc "job NAME", "Create a new job"
-      method_option :dependencies, :aliases => ['-d'], :type => :array, 
+      method_option :dependencies, :aliases => ['-d'], :type => :array,
         :desc => "List of package dependencies"
       def job(name)
         dependencies = options[:dependencies] || []
@@ -81,7 +73,7 @@ module Bosh
       end
 
       desc "micro [JOB]", "Create a micro job - a collection of all jobs and packages"
-      method_option :jobs, :aliases => ['-j'], :type => :array, 
+      method_option :jobs, :aliases => ['-j'], :type => :array,
         :desc => "Ordered list of jobs to include"
       def micro(job_name = "micro")
         specific_jobs = options[:jobs] || []
@@ -89,14 +81,14 @@ module Bosh
         Bosh::Gen::Generators::MicroJobGenerator.start([job_name, specific_jobs])
       end
 
-      desc "template JOB FILE_PATH", 
+      desc "template JOB FILE_PATH",
         "Add a Job template (example FILE_PATH: config/httpd.conf)"
       def template(job_name, file_path)
         require 'bosh/gen/generators/job_template_generator'
         Bosh::Gen::Generators::JobTemplateGenerator.start([job_name, file_path])
       end
-      
-      desc "extract-job SOURCE_PACKAGE_PATH", 
+
+      desc "extract-job SOURCE_PACKAGE_PATH",
         "Extracts a job from another release and all its " +
         "dependent packages and source"
       def extract_job(source_package_path)
@@ -105,7 +97,7 @@ module Bosh
         Bosh::Gen::Generators::ExtractJobGenerator.start([source_package_path])
       end
 
-      desc "extract-pkg SOURCE_PACKAGE_PATH", 
+      desc "extract-pkg SOURCE_PACKAGE_PATH",
         "Extracts a package from another release and all its " +
         "dependent packages and sources"
       def extract_pkg(source_package_path)
@@ -114,13 +106,13 @@ module Bosh
         Bosh::Gen::Generators::ExtractPackageGenerator.start([source_package_path])
       end
 
-      desc "manifest NAME PATH", 
+      desc "manifest NAME PATH",
         "Creates a deployment manifest based on the release located at PATH"
-      method_option :force, :type => :boolean, 
+      method_option :force, :type => :boolean,
         :desc => "Force override existing target manifest file"
-      method_option :addresses, :aliases => ['-a'], :type => :array, 
+      method_option :addresses, :aliases => ['-a'], :type => :array,
         :desc => "List of IP addresses available for jobs"
-      method_option :disk, :aliases => ['-d'], :type => :string, 
+      method_option :disk, :aliases => ['-d'], :type => :string,
         :desc => "Attach persistent disks to VMs of specific size, e.g. 8196"
       method_option :jobs, :type => :array,
         :desc => "Specific jobs to include in manifest [default: all]"

data/lib/bosh/gen/generators/job_generator.rb

@@ -9,17 +9,17 @@ module Bosh::Gen
       argument :job_name
       argument :dependencies, :type => :array
       argument :purpose
-      
+
       def self.source_root
         File.join(File.dirname(__FILE__), "job_generator", "templates")
       end
-      
+
       def check_root_is_release
         unless File.exist?("jobs") && File.exist?("packages")
           raise Thor::Error.new("run inside a BOSH release project")
         end
       end
-      
+
       def check_name
         raise Thor::Error.new("'#{job_name}' is not a valid BOSH id") unless job_name.bosh_valid_id?
       end
@@ -38,7 +38,7 @@ module Bosh::Gen
           end
         end
       end
-      
+
       # copy the thor template files into the bosh release to be bosh templates
       # that's right, templates (.tt) can become templates (.erb)
       def template_files
@@ -46,7 +46,6 @@ module Bosh::Gen
         directory "jobs/%job_name%_#{purpose}", "jobs/#{job_name}"
 
         # build a hash of { 'bin/webapp_ctl.erb' => 'bin/webapp_ctl', ...} used in spec
-        # TODO: do I need to flatten it to { 'webapp_ctl' => 'bin/webapp_ctl' }?
         @template_files = {}
         FileUtils.chdir(File.join(generator_job_templates_path, "templates")) do
           `ls */*`.split("\n").each do |template_file|
@@ -60,25 +59,25 @@ module Bosh::Gen
           end
         end
       end
-      
+
       def job_specification
         config = { "name" => job_name, "packages" => dependencies, "templates" => @template_files }
         create_file job_dir("spec"), YAML.dump(config)
       end
-      
+
       private
       def filenames
         files.map {|f| File.basename(f) }
       end
-      
+
       def job_dir(path)
         File.join("jobs", job_name, path)
       end
-      
+
       def valid_purposes
         %w[simple]
       end
-      
+
       # Run a command in git.
       #
       # ==== Examples

data/lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_simple/templates/bin/%job_name%_ctl.tt

@@ -14,13 +14,13 @@ case $1 in
   start)
     pid_guard $PIDFILE $JOB_NAME
 
-    # TODO: Run some process
-    exec chpst -u vcap:vcap TODO \
+    # store pid in $PIDFILE
+    echo $$ > $PIDFILE
+
+    exec chpst -u vcap:vcap <%= job_name %> \
          >>$LOG_DIR/$JOB_NAME.stdout.log \
          2>>$LOG_DIR/$JOB_NAME.stderr.log
 
-    # store pid in $PIDFILE
-    echo $! > $PIDFILE
     ;;
 
   stop)
@@ -33,4 +33,4 @@ case $1 in
     ;;
 
 esac
-exit 0
+exit 0

data/lib/bosh/gen/generators/new_release_generator.rb

@@ -1,32 +1,42 @@
-require 'yaml'
-require 'thor/group'
+require "yaml"
+require "thor/group"
+require "cyoi/cli/provider"
+require "cyoi/cli/blobstore"
+require "bosh/gen/settings"
 
 module Bosh::Gen
   module Generators
     class NewReleaseGenerator < Thor::Group
       include Thor::Actions
+      include Bosh::Gen::Settings
 
       argument :proposed_app_path
-      argument :flags, :type => :hash
-      
+
       def self.source_root
         File.join(File.dirname(__FILE__), "new_release_generator", "templates")
       end
-      
+
       def create_root
         self.destination_root = File.expand_path(repository_path, destination_root)
         empty_directory '.'
         FileUtils.cd(destination_root) unless options[:pretend]
       end
-      
+
+      def select_provider
+        self.settings_dir = File.expand_path("config")
+        provider = Cyoi::Cli::Provider.new([settings_dir])
+        provider.execute!
+        reload_settings!
+      end
+
       def readme
         template "README.md.tt", "README.md"
       end
-      
+
       def rakefile
         copy_file "Rakefile"
       end
-      
+
       def directories
         %w[jobs packages src blobs templates].each do |dir|
           directory dir
@@ -40,15 +50,16 @@ module Bosh::Gen
       def blobs_yaml
         create_file "config/blobs.yml", YAML.dump({})
       end
-      
-      # TODO - support other blobstores
-      def local_blobstore
+
+      def config_dev_yml
         config_dev = { "dev_name" => project_name }
         create_file "config/dev.yml", YAML.dump(config_dev)
+      end
 
+      def config_private_yml
         case blobstore_type
         when :local
-          config_private = { 
+          config_private = {
             "blobstore" => {
               "simple" => {
                 "user" => "USER",
@@ -57,41 +68,28 @@ module Bosh::Gen
             }
           }
         when :s3
-          config_private = { 
+          config_private = {
             "blobstore" => {
               "s3" => {
-                "access_key_id" => readwrite_aws_access_key,
-                "secret_access_key" => readwrite_aws_secret_access_key
-              }
-            }
-          }
-        when :atmos
-          config_private = { 
-            "blobstore" => {
-              "atmos" => {
-                "secret" => "SECRET"
+                "access_key_id" => settings.provider.credentials.aws_access_key_id,
+                "secret_access_key" => settings.provider.credentials.aws_secret_access_key
               }
             }
           }
+        # https://github.com/cloudfoundry/bosh/tree/master/blobstore_client#openstack-object-storage
         when :swift
           config_private = {
             "blobstore" => {
               "swift" => {
-                "rackspace" => {
-                  "rackspace_username" => "USERNAME",
-                  "rackspace_api_key" => "API_KEY"
-                },
-                "hp" => {
-                  "hp_account_id" => "ACCESS_KEY_ID",
-                  "hp_secret_key" => "SECRET_KEY",
-                  "hp_tenant_id" => "TENANT_ID"
-                },
+                settings.provider.name => settings.provider.credentials.to_hash
               }
             }
           }
         end
         create_file "config/private.yml", YAML.dump(config_private)
+      end
 
+      def config_final_yml
         case blobstore_type
         when :local
           say_status "warning", "config/final.yml defaulting to local blobstore /tmp/blobstore", :yellow
@@ -104,20 +102,7 @@ module Bosh::Gen
           config_final = { "blobstore" => {
               "provider" => "s3",
               "options" => {
-                "bucket_name" => repository_name,
-                "access_key_id" => readonly_aws_access_key,
-                "secret_access_key" => readonly_aws_secret_access_key,
-                "encryption_key" => "PERSONAL_RANDOM_KEY",
-              }
-            }
-          }
-        when :atmos
-          config_final = { "blobstore" => {
-              "provider" => "atmos",
-              "options" => {
-                "tag" => repository_name,
-                "url" => "https://blob.cfblob.com",
-                "uid" => "ATMOS_UID"
+                "bucket_name" => repository_name
               }
             }
           }
@@ -126,19 +111,20 @@ module Bosh::Gen
               "provider" => "swift",
               "options" => {
                 "container_name" => repository_name,
-                "swift_provider" => "SWIFT_PROVIDER"
+                "swift_provider" => swift_provider
               }
             }
           }
         end
-        
+
         create_file "config/final.yml", YAML.dump(config_final)
       end
-      
+
       def git_init
         create_file ".gitignore", <<-IGNORE.gsub(/^\s{8}/, '')
         config/dev.yml
         config/private.yml
+        config/settings.yml
         releases/*.tgz
         dev_releases
         blobs/*
@@ -157,7 +143,7 @@ module Bosh::Gen
         my*.yml
         IGNORE
       end
-      
+
       def setup_git
         git :init
         git :add => "."
@@ -170,6 +156,17 @@ module Bosh::Gen
         say "cd #{repository_path}", :yellow
       end
 
+      def create_blobstore
+        say ""
+        say "Finally..."
+        blobstore = Cyoi::Cli::Blobstore.new([blobstore_name, settings_dir])
+        blobstore.execute!
+        reload_settings!
+        say ""
+      end
+
+
+
       private
 
       # converts the base name into having -boshrelease suffix
@@ -177,6 +174,10 @@ module Bosh::Gen
         @repository_name ||= "#{project_name}-boshrelease"
       end
 
+      def blobstore_name
+        repository_name
+      end
+
       def repository_path
         File.join(File.dirname(proposed_app_path), repository_name)
       end
@@ -190,30 +191,31 @@ module Bosh::Gen
       end
 
       def project_name_hyphenated
-        project_name.gsub(/[^A-Za-z]+/, '-')
+        project_name.gsub(/[^A-Za-z0-9]+/, '-')
       end
 
       def project_name_underscored
-        project_name.gsub(/[^A-Za-z]+/, '_')
+        project_name.gsub(/[^A-Za-z0-9]+/, '_')
       end
 
       def blobstore_type
         return :s3 if s3?
-        return :atmos if atmos?
         return :swift if swift?
         return :local
       end
-      
+
       def s3?
-        flags[:aws]
-      end
-      
-      def atmos?
-        flags[:atmos]
+        settings.provider.name == "aws"
       end
 
       def swift?
-        flags[:swift]
+        settings.provider.name == "openstack"
+      end
+
+      # https://github.com/cloudfoundry/bosh/tree/master/blobstore_client#openstack-swift-provider
+      # TODO: supported: hp, openstack and rackspace; How to detect this from fog?
+      def swift_provider
+        "openstack"
       end
 
       # Run a command in git.
@@ -234,14 +236,6 @@ module Bosh::Gen
         end
       end
 
-      def readonly_aws_access_key
-        s3_credentials "readonly_access_key", "READONLY_AWS_ACCESS_KEY"
-      end
-
-      def readonly_aws_secret_access_key
-        s3_credentials "readonly_secret_access_key", "READONLY_AWS_SECRET_ACCESS_KEY"
-      end
-
       def readwrite_aws_access_key
         s3_credentials "readwrite_access_key", "READWRITE_AWS_ACCESS_KEY"
       end
@@ -261,6 +255,7 @@ module Bosh::Gen
         end
         @s3_credentials[key] || default
       end
+
     end
   end
 end