dapp 0.8.0 → 0.9.0

data/lib/dapp/cli/base.rb

@@ -1,7 +1,6 @@
 module Dapp
   class CLI
-    # Base of CLI subcommands
-    class Base < CLI
+    class Base < ::Dapp::CLI
       option :dir,
              long: '--dir PATH',
              description: 'Change to directory',
@@ -56,9 +55,8 @@ module Dapp
         super()
       end
 
-      def run(argv = ARGV)
-        self.class.parse_options(self, argv)
-        Project.new(cli_options: config, dimgs_patterns: cli_arguments).public_send(class_to_lowercase)
+      def run(_argv = ARGV)
+        raise
       end
     end
   end

data/lib/dapp/config/base.rb

@@ -1,19 +1,22 @@
 module Dapp
   module Config
-    # Base
     class Base
-      def initialize(project:, &blk)
-        @project = project
+      def initialize(dapp:, &blk)
+        @dapp = dapp
         instance_eval(&blk) if block_given?
       end
 
       protected
 
-      attr_reader :project
+      attr_reader :dapp
+
+      def ref_variables
+        [:@dapp]
+      end
 
       def marshal_dump
         instance_variables
-          .reject {|variable| variable == :@project}
+          .reject {|variable| ref_variables.include? variable}
           .map {|variable| [variable, instance_variable_get(variable)]}
       end
 
@@ -26,11 +29,20 @@ module Dapp
       end
 
       def _clone
-        Marshal.load Marshal.dump(self)
+        Marshal.load(Marshal.dump(self)).tap do |obj|
+          _set_ref_variables_to(obj)
+        end
       end
 
       def _clone_to(obj)
-        obj.marshal_load marshal_dump
+        obj.marshal_load(marshal_dump)
+        _set_ref_variables_to(obj)
+      end
+
+      def _set_ref_variables_to(obj)
+        ref_variables.each do |ref_variable|
+          obj.instance_variable_set(ref_variable, instance_variable_get(ref_variable))
+        end
       end
     end
   end

data/lib/dapp/config/directive/base.rb

@@ -1,7 +1,6 @@
 module Dapp
   module Config
     module Directive
-      # Base
       class Base < Config::Base
         protected
 

data/lib/dapp/config/error/config.rb

@@ -0,0 +1,7 @@
+module Dapp
+  module Config
+    module Error
+      class Config < ::Dapp::Error::Base; end
+    end
+  end
+end

data/lib/dapp/core_ext/hash.rb

@@ -1,7 +1,5 @@
 module Dapp
-  # CoreExt
   module CoreExt
-    # Hash
     module Hash
       def in_depth_merge(hash) # do not conflict with activesupport`s deep_merge
         merge(hash) do |_, v1, v2|

data/lib/dapp/core_ext/pathname.rb

@@ -1,7 +1,5 @@
 module Dapp
-  # CoreExt
   module CoreExt
-    # Pathname
     module Pathname
       def subpath_of?(another_path)
         another_path_descends = []
@@ -10,7 +8,7 @@ module Dapp
         path_descends = []
         cleanpath.descend {|d| path_descends << d}
 
-        (path_descends & another_path_descends) == another_path_descends and
+        (path_descends & another_path_descends) == another_path_descends &&
           (path_descends - another_path_descends).any?
       end
 

data/lib/dapp/{project.rb → dapp.rb}

@@ -1,29 +1,10 @@
 module Dapp
-  # Project
-  class Project
+  class Dapp
     include Lock
     include GitArtifact
     include Dappfile
     include Chef
 
-    include Command::Common
-    include Command::Run
-    include Command::Build
-    include Command::Bp
-    include Command::Push
-    include Command::Spush
-    include Command::Tag
-    include Command::List
-    include Command::Stages::CleanupLocal
-    include Command::Stages::CleanupRepo
-    include Command::Stages::FlushLocal
-    include Command::Stages::FlushRepo
-    include Command::Stages::Push
-    include Command::Stages::Pull
-    include Command::Stages::Common
-    include Command::Cleanup
-    include Command::Mrproper
-    include Command::StageImage
     include Logging::Base
     include Logging::Process
     include Logging::I18n
@@ -115,5 +96,5 @@ module Dapp
     def dev_mode?
       !!cli_options[:dev]
     end
-  end # Project
+  end # Dapp
 end # Dapp

data/lib/dapp/{project → dapp}/chef.rb

@@ -1,7 +1,5 @@
 module Dapp
-  # Project
-  class Project
-    # Chef
+  class Dapp
     module Chef
       def local_git_artifact_exclude_paths(&blk)
         super do |exclude_paths|
@@ -15,5 +13,5 @@ module Dapp
         Pathname.new(path).join('.dapp_chef')
       end
     end # Chef
-  end # Project
+  end # Dapp
 end # Dapp

data/lib/dapp/{project → dapp}/dappfile.rb

@@ -1,7 +1,5 @@
 module Dapp
-  # Project
-  class Project
-    # Dappfile
+  class Dapp
     module Dappfile
       def local_git_artifact_exclude_paths(&blk)
         super do |exclude_paths|
@@ -14,13 +12,13 @@ module Dapp
       def build_configs
         @configs ||= begin
           dimgs(dappfile_path).flatten.tap do |dimgs|
-            raise Error::Project, code: :no_such_dimg, data: { dimgs_patterns: dimgs_patterns.join(', ') } if dimgs.empty?
+            raise Error::Dapp, code: :no_such_dimg, data: { dimgs_patterns: dimgs_patterns.join(', ') } if dimgs.empty?
           end
         end
       end
 
       def dappfile_path
-        raise Error::Project, code: :dappfile_not_found unless (dappfile_path = search_file_upward('Dappfile'))
+        raise Error::Dapp, code: :dappfile_not_found unless (dappfile_path = search_file_upward('Dappfile'))
         dappfile_path
       end
 
@@ -35,7 +33,7 @@ module Dapp
       end
 
       def dimgs(dappfile_path)
-        Config::DimgGroupMain.new(project: self) do |conf|
+        Dimg::Config::DimgGroupMain.new(dapp: self) do |conf|
           begin
             conf.instance_eval File.read(dappfile_path), dappfile_path
           rescue SyntaxError, StandardError => e
@@ -58,5 +56,5 @@ module Dapp
         end
       end
     end # Dappfile
-  end # Project
+  end # Dapp
 end # Dapp

data/lib/dapp/{project → dapp}/deps/base.rb

@@ -1,9 +1,6 @@
 module Dapp
-  # Project
-  class Project
-    # Deps
+  class Dapp
     module Deps
-      # Base
       module Base
         BASE_VERSION = '0.1.14'.freeze
 
@@ -26,7 +23,7 @@ module Dapp
           end
         end
 
-        %w(rsync diff date cat
+        %w(rm rsync diff date cat
            stat sleep mkdir find
            install sed cp true
            bash tar sudo).each do |cmd|
@@ -48,5 +45,5 @@ module Dapp
         end
       end # Base
     end # Deps
-  end # Project
+  end # Dapp
 end # Dapp

data/lib/dapp/{project → dapp}/deps/gitartifact.rb

@@ -1,9 +1,6 @@
 module Dapp
-  # Project
-  class Project
-    # Deps
+  class Dapp
     module Deps
-      # Gitartifact
       module Gitartifact
         GITARTIFACT_VERSION = '0.1.7'.freeze
 
@@ -32,5 +29,5 @@ module Dapp
         end
       end # Gitartifact
     end # Deps
-  end # Project
+  end # Dapp
 end # Dapp

data/lib/dapp/{project → dapp}/git_artifact.rb

@@ -1,7 +1,5 @@
 module Dapp
-  # Project
-  class Project
-    # GitArtifact
+  class Dapp
     module GitArtifact
       def local_git_artifact_exclude_paths(&blk)
         @local_git_artifact_exclude_paths ||= [].tap do |exclude_paths|
@@ -9,5 +7,5 @@ module Dapp
         end
       end
     end # GitArtifact
-  end # Project
+  end # Dapp
 end # Dapp

data/lib/dapp/{project → dapp}/lock.rb

@@ -1,7 +1,5 @@
 module Dapp
-  # Project
-  class Project
-    # Lock
+  class Dapp
     module Lock
       def lock_path
         build_path.join('locks')
@@ -9,7 +7,7 @@ module Dapp
 
       def _lock(name)
         @_locks ||= {}
-        @_locks[name] ||= ::Dapp::Lock::File.new(lock_path, name)
+        @_locks[name] ||= ::Dapp::Dimg::Lock::File.new(lock_path, name)
       end
 
       def lock(name, *_args, default_timeout: 300, **kwargs, &blk)
@@ -30,5 +28,5 @@ module Dapp
         end
       end
     end # Lock
-  end # Project
+  end # Dapp
 end # Dapp

data/lib/dapp/{project → dapp}/logging/base.rb

@@ -1,9 +1,6 @@
 module Dapp
-  # Project
-  class Project
-    # Logging
+  class Dapp
     module Logging
-      # Base
       module Base
         def log_quiet?
           cli_options[:log_quiet]
@@ -139,5 +136,5 @@ module Dapp
         end
       end
     end # Logging
-  end # Project
+  end # Dapp
 end # Dapp

data/lib/dapp/{project → dapp}/logging/i18n.rb

@@ -1,10 +1,9 @@
 module Dapp
-  class Project
+  class Dapp
     module Logging
-      # I18n
       module I18n
         def self.initialize
-          ::I18n.load_path << Dir[File.join(Dapp.root, 'config', '**', '*')].select { |path| File.file?(path) }
+          ::I18n.load_path << Dir[File.join(::Dapp.root, 'config', '**', '*')].select { |path| File.file?(path) }
           ::I18n.reload!
           ::I18n.locale = :en
         end

data/lib/dapp/{project → dapp}/logging/paint.rb

@@ -1,8 +1,6 @@
 module Dapp
-  # Project
-  class Project
+  class Dapp
     module Logging
-      # Paint
       module Paint
         FORMAT = {
           step: [:yellow, :bold],
@@ -43,5 +41,5 @@ module Dapp
         end
       end # Paint
     end
-  end # Project
+  end # Dapp
 end # Dapp

data/lib/dapp/{project → dapp}/logging/process.rb

@@ -1,9 +1,6 @@
 module Dapp
-  # Project
-  class Project
-    # Logging
+  class Dapp
     module Logging
-      # Process
       module Process
         DEFAULT_STYLE = {
           message: :step,
@@ -107,5 +104,5 @@ module Dapp
         end
       end
     end # Logging
-  end # Project
+  end # Dapp
 end # Dapp

data/lib/dapp/{project → dapp}/shellout/base.rb

@@ -1,8 +1,6 @@
 module Dapp
-  class Project
-    # Shellout
+  class Dapp
     module Shellout
-      # Base
       module Base
         include Streaming
 
@@ -52,7 +50,7 @@ module Dapp
         protected
 
         def shellout_with_logging(log_verbose: false, **kwargs)
-          return yield(**kwargs) unless instance_of? Project
+          return yield(**kwargs) unless instance_of? Dapp
 
           begin
             stream = Stream.new

data/lib/dapp/{project → dapp}/shellout/streaming.rb

@@ -1,9 +1,7 @@
 module Dapp
-  class Project
+  class Dapp
     module Shellout
-      # Streaming
       module Streaming
-        # Stream
         class Stream
           def buffer
             @buffer ||= []
@@ -18,9 +16,7 @@ module Dapp
           end
         end
 
-        # Proxy
         module Proxy
-          # Base
           class Base
             def initialize(*streams, with_time: false)
               @streams = streams
@@ -32,14 +28,13 @@ module Dapp
             end
 
             def format_string(str)
-              str.lines.map { |l| "#{Project.log_time if @with_time}#{l.strip}\n" }.join
+              str.lines.map { |l| "#{Dapp.log_time if @with_time}#{l.strip}\n" }.join
             end
           end
 
-          # Error
           class Error < Base
             def format_string(str)
-              "#{Project.paint_string(super.strip, :warning)}\n"
+              "#{Dapp.paint_string(super.strip, :warning)}\n"
             end
           end
         end

data/lib/dapp/{project → dapp}/ssh_agent.rb

@@ -1,16 +1,14 @@
 module Dapp
-  # Project
-  class Project
-    # SshAgent
+  class Dapp
     module SshAgent
       class << self
         def included(_base)
-          ::Dapp::Project::Shellout::Base.default_env_keys << 'SSH_AUTH_SOCK'
+          ::Dapp::Dapp::Shellout::Base.default_env_keys << 'SSH_AUTH_SOCK'
         end
       end # << self
 
       def run_ssh_agent
-        raise 'Cannot fork dapp process: there are active file locks' unless ::Dapp::Lock::File.counter.zero?
+        raise 'Cannot fork dapp process: there are active file locks' unless ::Dapp::Dimg::Lock::File.counter.zero?
 
         sock_name = "dapp-ssh-#{SecureRandom.uuid}"
 
@@ -39,7 +37,7 @@ module Dapp
               sleep 0.001 until File.exist? sock_path
             end
           rescue ::Timeout::Error
-            raise ::Dapp::Error::Project, code: :cannot_run_ssh_agent
+            raise Error::Dapp, code: :cannot_run_ssh_agent
           end
         end # sock_path
       end
@@ -65,13 +63,12 @@ module Dapp
         return unless cli_options[:ssh_key]
 
         cli_options[:ssh_key].each do |ssh_key|
-          raise ::Dapp::Error::Project, code: :ssh_key_not_found,
-                                        data: { path: ssh_key } unless File.exist? ssh_key
+          raise Error::Dapp, code: :ssh_key_not_found, data: { path: ssh_key } unless File.exist? ssh_key
 
           File.chmod 0o600, ssh_key
           add_ssh_key ssh_key
         end
       end
     end # SshAgent
-  end # Project
+  end # Dapp
 end # Dapp