bard 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f5ecd87f7e75c849307787fa9cbbdc3deda8bff5a00c697cfd74e998817cd97
-  data.tar.gz: 8188084e5da82c13e25a85d65d2ce72e17def72a1b532850ca033d3d95b975bd
+  metadata.gz: 62659c90d5cd7cf39ef14edf5b0146338d0571fff437df85040d4cdcb0d82ff0
+  data.tar.gz: e3ac33d2ca9513a925060561a3a40608236346ee87a2beaca6524f8922da1bdd
 SHA512:
-  metadata.gz: f88de372c1f5a318ed1fc8ccf5796301d6128d876b7f0df1a78efd07760b3c91655a39d0cf8d4bca91d57c0fcf22534660b9df71d14c475d3927bb316a752ab1
-  data.tar.gz: cfb453652fda76f97812f2c42662a7fe6de43b0ffd666688ce4351a3c7079a3d793f8fd5d0975e21dacdfb4baf7f523705c5a1da41856299f4212de8d34c1ca9
+  metadata.gz: 9b50ddaeba02751089df9469427a663ebd36481115c01a1e72e808f96d9a869fd929cbf20df185668536b91e1c838090c82b41a1b05b0af990ebd31a328c3b3c
+  data.tar.gz: 638a531d23991f1fd01e284eaf1951994da92ab6ad695d1c9a53d10e814c7be91c5c3c487a90dd9b45d3443000f7e029198451140876d4674e68e162bc29420e

data/features/bard_check.feature

@@ -17,7 +17,7 @@ Feature: Bard can check its environment for missing dependencies and potential p
     And the database is missing
     When I type "bard check"
     Then I should see the fatal error "missing database"
- 
+
   Scenario: Bard check detects pending migrations
     Given a shared rails project
     And a commit with a new migration

data/features/bard_push.feature

@@ -42,7 +42,7 @@ Feature: bard push
     Then on staging, there should be one new submodule
     And the submodule branch should match the submodule origin branch
     And on staging, the submodule working directory should be clean
- 
+
   Scenario: Pushing a change that includes a submodule update
     Given a submodule
     And a commit with a submodule update

data/lib/bard/cli/setup.rb

@@ -6,39 +6,50 @@ module Bard::CLI::Setup
 
       desc "setup", "installs app in nginx"
       def setup
-        path = "/etc/nginx/sites-available/#{project_name}"
-        dest_path = path.sub("sites-available", "sites-enabled")
-        server_name = case ENV["RAILS_ENV"]
-        when "production"
-          (config[:production].ping.map do |str|
-            "*.#{URI.parse(str).host}"
-          end + ["_"]).join(" ")
-        when "staging" then "#{project_name}.botandrose.com"
-        else "#{project_name}.localhost"
-        end
-
-        system "sudo tee #{path} >/dev/null <<-EOF
-server {
-  listen 80;
-  server_name #{server_name};
+        system "sudo tee /etc/nginx/snippets/common.conf >/dev/null <<-EOF
+listen 80;
 
-  root #{Dir.pwd}/public;
-  passenger_enabled on;
+passenger_enabled on;
 
-  location ~* \\.(ico|css|js|gif|jp?g|png|webp) {
+location ~* \\.(ico|css|js|gif|jp?g|png|webp) {
     access_log off;
     if (\\$request_filename ~ \"-[0-9a-f]{32}\\.\") {
-      expires max;
-      add_header Cache-Control public;
+        expires max;
+        add_header Cache-Control public;
     }
-  }
-  gzip_static on;
+}
+
+gzip_static on;
+EOF"
+
+        path = "/etc/nginx/sites-available/#{project_name}"
+        system "sudo tee #{path} >/dev/null <<-EOF
+server {
+    include /etc/nginx/snippets/common.conf;
+    server_name #{nginx_server_name};
+    root #{Dir.pwd}/public;
 }
 EOF"
+
+        dest_path = path.sub("sites-available", "sites-enabled")
         system "sudo ln -sf #{path} #{dest_path}" if !File.exist?(dest_path)
+
         system "sudo service nginx restart"
       end
 
+      private
+
+      def nginx_server_name
+        case ENV["RAILS_ENV"]
+        when "production"
+          (config[:production].ping.map do |str|
+            "*.#{URI.parse(str).host}"
+          end + ["_"]).join(" ")
+        when "staging" then "#{project_name}.botandrose.com"
+        else "#{project_name}.localhost"
+        end
+      end
+
     end
   end
 end

data/lib/bard/config.rb

@@ -10,7 +10,7 @@ module Bard
           :local,
           false,
           "./",
-          false,
+          "#{project_name}.local",
         ),
         gubs: Server.new(
           project_name,
@@ -22,14 +22,16 @@ module Bard
         ci: Server.new(
           project_name,
           :ci,
-          "jenkins@ci.botandrose.com:22022",
+          "jenkins@staging.botandrose.com:22022",
           "jobs/#{project_name}/workspace",
           false,
         ),
         staging: Server.new(
           project_name,
           :staging,
-          "www@#{project_name}.botandrose.com:22022",
+          "www@staging.botandrose.com:22022",
+          project_name,
+          "#{project_name}.botandrose.com",
         ),
       }
       if path && File.exist?(path)

data/lib/bard/provision/ssh.rb

@@ -27,7 +27,7 @@ class Bard::Provision::SSH < Bard::Provision
     ssh_url << ":#{target_port}"
     puts " ✓"
   end
- 
+
   private
 
   def target_port

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Micah Geisel