mimas 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a200733060462cb02f5bb316922a18a44f2c02631707ded251f42f25fd4ea0ac
-  data.tar.gz: ddd5a59c92ae52c85312a92698e3d8f2b7ca85f53c7333bc82376d9bf4b47742
+  metadata.gz: ea7a87706ea7f9976b782cb891e446b813c7c866e2a4907f451565e670d194a5
+  data.tar.gz: adde800fcc3df657cc512cfd14b9fe1ef314e3d4f19f903c68259c3d7394ef28
 SHA512:
-  metadata.gz: 05d4669a9e1122b00de75885ad66734ca6b19da728e5b7b5df02e8a68d46dc2cf3d0bc01155ba88c41949c41534c71d8750608fb688e4c14b340aeca08acfc79
-  data.tar.gz: 632f575040f53862208831bef4f743ee9960f1a47a56023b15c0b2c49a5767e70a8e14fac0a22c030cd15373f7d168659f6d8f478dc1d2e506ea6b9114c5f08a
+  metadata.gz: 984c764fc02feeb671c63f33528258abb8ad271811400d27affe7e220fd4eb6d66652b57a3b829fa1bf972aa23a6a2d5fbb42fe6bc7ec290cf1c1155fc352654
+  data.tar.gz: 939fa01df07457e75ecb9b2929757edfa0045cb109ec7f7b33366566397af491aca94df1f4a00125f99bd119ab05fc8cc4b318f3cb6c21e0bdabbc03a1853619

data/lib/mimas/archiver.rb

@@ -2,18 +2,12 @@ require 'zlib'
 require 'rubygems/package'
 
 module Mimas
-  module Archive
-    def archive(root: Dir.pwd, output:, archive_root: "", glob: nil, files: [])
-      Archiver
-        .new(root: root, output: output, archive_root: archive_root, glob: glob, files: files)
-        .package
-    end
-  end
-
   class Archiver
-    def initialize(root:, output:, archive_root:, glob: nil, files: [])
+    DEFAULT_OUTPUT_PATH = Pathname.new(Dir.pwd).join("tmp")
+
+    def initialize(root:, output_path: DEFAULT_OUTPUT_PATH, output_file:, archive_root: nil, glob: nil, files: [])
       @root = root ||  Dir.pwd
-      @output = output
+      @output = Pathname.new(output_path).join(output_file)
       @archive_root = archive_root || ""
       @glob = glob
       @source_files = files
@@ -27,6 +21,8 @@ module Mimas
 
       tar.close
       gz.close
+
+      return @output.to_s
     end
 
     private

data/lib/mimas/cli.rb

@@ -8,6 +8,7 @@ module Mimas
       register "provision", Provision
       register "push", Push
       register "console", Console
+      register "archive", Archive
       register "setup caddy", Setup::Caddy
       register "setup deploy_user", Setup::DeployUser
       register "setup ruby", Setup::Ruby

data/lib/mimas/commands/archive.rb

@@ -0,0 +1,19 @@
+module Mimas
+  module CLI
+    module Commands
+      class Archive < BaseCommand
+        desc "Create your site's archive which will be uploaded to the server"
+
+        argument :site, desc: "The name of the site to archive"
+
+        def call(site: :default)
+          site    = Config.current.sites[site.to_sym]
+
+          site.archive
+
+          say "Your site's archive has been created in #{Archiver::DEFAULT_OUTPUT_PATH}"
+        end
+      end
+    end
+  end
+end

data/lib/mimas/commands/console.rb

@@ -7,7 +7,7 @@ module Mimas
         argument :server_name, required: true,   desc: "The name of the server to run the console on"
         argument :site,                          desc: "The site to run the console for. Uses the default site if unspecified"
 
-        def call(server_name, site: :default)
+        def call(server_name:, site: :default)
           server  = Config.current.servers[server_name.to_sym]
           site    = Config.current.sites[site.to_sym]
 

data/lib/mimas/deployment/paths.rb

@@ -10,7 +10,7 @@ module Mimas
       end
 
       def archive_path
-        @archive_path ||= File.join(Dir.pwd, "tmp", archive_name)
+        @archive_path
       end
 
       def site_root

data/lib/mimas/deployment/ruby_app.rb

@@ -4,7 +4,7 @@ module Mimas
       def deploy_ruby_app
         say "Starting deployment for #{site.domain}"
 
-        archive(output: archive_path, files: site.files)
+        @archive_path = site.archive(filename: archive_name)
 
         ssh(server) do |session|
           validate_server_ruby_version(session)

data/lib/mimas/deployment/static_site.rb

@@ -4,7 +4,7 @@ module Mimas
       def deploy_static_site
         say "Starting deployment for #{site.domain}"
 
-        archive(root: site.root_dir, output: archive_path, archive_root: "root", glob: site.glob)
+        @archive_path = site.archive(filename: archive_name)
 
         ssh(server) do |session|
           refreshing_caddy(session) do

data/lib/mimas/deployment.rb

@@ -1,6 +1,6 @@
 module Mimas
   class Deployment
-    include Terminal::Printer, Template, Archive, SSH
+    include Terminal::Printer, Template, SSH
 
     include Paths, Files
     include StaticSite, RubyApp, Caddy

data/lib/mimas/site/archive.rb

@@ -0,0 +1,13 @@
+module Mimas
+  class Site
+    module Archive
+      def archive(filename: "#{name}.tar.gz")
+        if self.ruby_app?
+          Archiver.new(output_file: filename, files: files).package
+        else
+          Archiver.new(root: root_dir, output_file: filename, archive_root: "root", glob: glob, files: files).package
+        end
+      end
+    end
+  end
+end

data/lib/mimas/site.rb

@@ -1,5 +1,7 @@
 module Mimas
   class Site
+    include Archive
+
     attr_reader :name
     def initialize(name, args)
       @name = name
@@ -21,21 +23,34 @@ module Mimas
       services.any?
     end
 
+    # Placeholder, will be overwritten by the config file if defined
+    def glob
+      nil
+    end
+
+    # Placeholder, will be overwritten by the config file if defined
+    def files
+      nil
+    end
+
     def validate!
       raise Config::InvalidConfiguration.new("`site` requires a `domain`") \
         unless self.respond_to?(:domain)
 
       if ruby_app?
         raise Config::InvalidConfiguration.new("`site` requires a `files` directive") \
-          unless self.respond_to?(:files)
+          unless self.files != nil
 
         services.values.each do |service|
           raise Config::InvalidConfiguration.new("#{service[:name]} service requires a `command` directive") \
             unless service[:command]
         end
       else
-        raise Config::InvalidConfiguration.new("`site` requires a `root_dir` and `glob` directive") \
-          unless self.respond_to?(:root_dir) && self.respond_to?(:glob)
+        raise Config::InvalidConfiguration.new("`site` requires a `root_dir` directive") \
+          unless self.respond_to?(:root_dir)
+
+        raise Config::InvalidConfiguration.new("`site` requires a `files` or `glob` directive") \
+          unless self.glob != nil || self.files != nil
       end
 
       true

data/lib/mimas/version.rb

@@ -1,3 +1,3 @@
 module Mimas
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/lib/mimas.rb

@@ -16,6 +16,7 @@ require_relative "mimas/hooks"
 
 require_relative "mimas/config"
 
+require_relative "mimas/site/archive"
 require_relative "mimas/site"
 
 require_relative "mimas/server/prerequisites"
@@ -35,6 +36,7 @@ require_relative "mimas/deployment"
 require_relative "mimas/plugins"
 
 require_relative "mimas/base_command"
+require_relative "mimas/commands/archive"
 require_relative "mimas/commands/console"
 require_relative "mimas/commands/init"
 require_relative "mimas/commands/install"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mimas
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Ayush Newatia
@@ -104,6 +104,7 @@ files:
 - lib/mimas/archiver.rb
 - lib/mimas/base_command.rb
 - lib/mimas/cli.rb
+- lib/mimas/commands/archive.rb
 - lib/mimas/commands/console.rb
 - lib/mimas/commands/init.rb
 - lib/mimas/commands/install.rb
@@ -135,6 +136,7 @@ files:
 - lib/mimas/server/prerequisites.rb
 - lib/mimas/server/ruby.rb
 - lib/mimas/site.rb
+- lib/mimas/site/archive.rb
 - lib/mimas/ssh.rb
 - lib/mimas/template.rb
 - lib/mimas/templates/Caddyfile.ruby.erb