odania-static-pages 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7daf33ae327e89440d7c6c34a5f9617b84eadc8
-  data.tar.gz: 79a77a816c345f184dd89b81da735a56dbdd233c
+  metadata.gz: fdf1d65c68bf508a1cd71caf770b1a0c483e5428
+  data.tar.gz: c8cfc0da9684acc62e72308bfb5a4686f274234a
 SHA512:
-  metadata.gz: 81d3320c164d9cada2fe2d532347252b8ff1059267391209226071c3f8985bca2da0c76a383c54f0943c9d65cc4b692418771a7c43bc5262002509d23b631f09
-  data.tar.gz: d2c5390105a055afb7757a2354f45c6d1a2de600831a7e7feac2d394313d03a53c4558c657859bfa48ef0a9a3428869c56f3780a54b57dbbe73d0fe13b48c8f9
+  metadata.gz: d69ad404e678ce5c427a496020c474ecb0ceb21308dbc077aa4fb86fc99ecf3891bb61843cee3e43e0ee265e75c4844f45f91d59a0d6c03937e1447a65cc6a52
+  data.tar.gz: 0f028e9dc997ce99e574c97a55d5f11562f1fb66a7f08910444bc58bd0e2050240d47ca5c59b5bbd91c3def015af20caba7348dc32d4115bc5418b07be287b3d

data/lib/odania_static_pages/config/generator/jekyll.rb

@@ -49,6 +49,8 @@ module OdaniaStaticPages
 					end
 
 					puts ' -> Linking Gemfile*'
+					dot_bundle_folder = File.join(full_common_folder, '.bundle')
+					FileUtils.ln_s dot_bundle_folder, page_path, force: true if File.exist? dot_bundle_folder
 					FileUtils.ln_s File.join(full_common_folder, 'Gemfile'), File.join(page_path, 'Gemfile'), force: true
 					FileUtils.ln_s File.join(full_common_folder, 'Gemfile.lock'), File.join(page_path, 'Gemfile.lock'), force: true
 

data/lib/odania_static_pages/config.rb

@@ -64,6 +64,11 @@ module OdaniaStaticPages
 		end
 
 		def current_environment
+			if @environments[@environment].nil?
+				puts "Environment #{environment} no found!"
+				puts "Available Environments: #{@environments.keys}"
+				exit 1
+			end
 			@environments[@environment]
 		end
 

data/lib/odania_static_pages/deploy/docker_compose.rb

@@ -55,7 +55,7 @@ module OdaniaStaticPages
 				compose_file = File.join(@config.project_dir, environment.output_path, 'docker-compose.yml')
 
 				puts "Writing docker compose to #{compose_file}"
-				docker_compose_generator = DockerComposeGenerator.new @config, environment
+				docker_compose_generator = DockerComposeGenerator.new @config, environment, @nginx_conf_dir
 				docker_compose_generator.write compose_file
 			end
 
@@ -66,6 +66,7 @@ module OdaniaStaticPages
 					full_site_name = "#{site_name}.lvh.me"
 					puts "Writing vhost for: #{full_site_name}"
 					expires = @deploy_config.expires
+					FileUtils.mkdir_p @nginx_conf_dir
 					File.write File.join(@nginx_conf_dir, "#{site_name}.conf"), vhost_renderer.result(binding)
 
 					sites[site_name] = "#{site_name}.lvh.me:8080"
@@ -76,6 +77,7 @@ module OdaniaStaticPages
 				end
 
 				puts 'Generating index.html'
+				FileUtils.mkdir_p @config.output_site_path
 				renderer = ERB.new(File.read(File.join(@config.base_dir, 'templates', 'nginx', 'index.html.erb')))
 				File.write File.join(@config.output_site_path, 'index.html'), renderer.result(binding)
 
@@ -127,9 +129,9 @@ module OdaniaStaticPages
 			class DockerComposeGenerator
 				attr_reader :nginx_volume_html, :nginx_volume_conf_d, :nginx_volume_nginx_conf, :compose_images
 
-				def initialize(config, environment)
+				def initialize(config, environment, nginx_conf_dir)
 					@nginx_volume_html = "#{config.output_site_path}:/srv:ro"
-					@nginx_volume_conf_d = "#{@nginx_conf_dir}:/etc/nginx/conf.d:ro"
+					@nginx_volume_conf_d = "#{nginx_conf_dir}:/etc/nginx/conf.d:ro"
 					@nginx_volume_nginx_conf = "#{File.join(config.output_path, 'nginx', 'nginx.conf')}:/etc/nginx/nginx.conf"
 					@compose_images = environment.deploy_module.compose_images
 					@erb_template = File.join(config.base_dir, 'templates', 'docker-compose', 'docker-compose.yml.erb')

data/lib/odania_static_pages/generator/jekyll.rb

@@ -91,7 +91,9 @@ module OdaniaStaticPages
 				puts `cd #{File.join(@generator_config.pages_dir, site_path)} && bundle check`
 				puts `cd #{File.join(@generator_config.pages_dir, site_path)} && bundle install --path ~/.gems` unless $?.success?
 
-				cmd = "cd #{ File.join(@generator_config.pages_dir, site_path) } && JEKYLL_ENV=#{jekyll_env} bundle exec jekyll build #{options}"
+				full_site_path = File.join(@generator_config.pages_dir, site_path)
+				env_vars = "BUNDLE_GEMFILE=#{full_site_path}/Gemfile JEKYLL_ENV=#{jekyll_env}"
+				cmd = "cd #{full_site_path} && #{env_vars} bundle exec jekyll build #{options}"
 				puts " -> Building site [cmd: #{cmd}]"
 				unless system(cmd)
 					puts "Error building site: #{site_path}"

data/lib/odania_static_pages/version.rb

@@ -1,3 +1,3 @@
 module OdaniaStaticPages
-	VERSION = '0.1.0'
+	VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odania-static-pages
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mike Petersen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Helper For creating static pages