dapp 0.8.0 → 0.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (299) hide show
  1. checksums.yaml +4 -4
  2. data/bin/dapp +5 -5
  3. data/config/en/common.yml +6 -4
  4. data/config/en/net_status.yml +8 -7
  5. data/lib/dapp.rb +157 -139
  6. data/lib/dapp/cli.rb +6 -16
  7. data/lib/dapp/cli/base.rb +3 -5
  8. data/lib/dapp/config/base.rb +19 -7
  9. data/lib/dapp/config/directive/base.rb +0 -1
  10. data/lib/dapp/config/error/config.rb +7 -0
  11. data/lib/dapp/core_ext/hash.rb +0 -2
  12. data/lib/dapp/core_ext/pathname.rb +1 -3
  13. data/lib/dapp/{project.rb → dapp.rb} +2 -21
  14. data/lib/dapp/{project → dapp}/chef.rb +2 -4
  15. data/lib/dapp/{project → dapp}/dappfile.rb +5 -7
  16. data/lib/dapp/{project → dapp}/deps/base.rb +3 -6
  17. data/lib/dapp/{project → dapp}/deps/gitartifact.rb +2 -5
  18. data/lib/dapp/{project → dapp}/git_artifact.rb +2 -4
  19. data/lib/dapp/{project → dapp}/lock.rb +3 -5
  20. data/lib/dapp/{project → dapp}/logging/base.rb +2 -5
  21. data/lib/dapp/{project → dapp}/logging/i18n.rb +2 -3
  22. data/lib/dapp/{project → dapp}/logging/paint.rb +2 -4
  23. data/lib/dapp/{project → dapp}/logging/process.rb +2 -5
  24. data/lib/dapp/{project → dapp}/shellout/base.rb +2 -4
  25. data/lib/dapp/{project → dapp}/shellout/streaming.rb +3 -8
  26. data/lib/dapp/{project → dapp}/ssh_agent.rb +6 -9
  27. data/lib/dapp/dimg.rb +1 -192
  28. data/lib/dapp/dimg/artifact.rb +24 -0
  29. data/lib/dapp/dimg/build/stage/after_install_artifact.rb +14 -0
  30. data/lib/dapp/dimg/build/stage/after_setup_artifact.rb +18 -0
  31. data/lib/dapp/dimg/build/stage/artifact_base.rb +80 -0
  32. data/lib/dapp/dimg/build/stage/artifact_default.rb +63 -0
  33. data/lib/dapp/dimg/build/stage/base.rb +210 -0
  34. data/lib/dapp/dimg/build/stage/before_install.rb +33 -0
  35. data/lib/dapp/dimg/build/stage/before_install_artifact.rb +14 -0
  36. data/lib/dapp/dimg/build/stage/before_setup.rb +31 -0
  37. data/lib/dapp/dimg/build/stage/before_setup_artifact.rb +14 -0
  38. data/lib/dapp/dimg/build/stage/build_artifact.rb +31 -0
  39. data/lib/dapp/dimg/build/stage/docker_instructions.rb +25 -0
  40. data/lib/dapp/dimg/build/stage/from.rb +50 -0
  41. data/lib/dapp/dimg/build/stage/ga_archive.rb +28 -0
  42. data/lib/dapp/dimg/build/stage/ga_archive_dependencies.rb +27 -0
  43. data/lib/dapp/dimg/build/stage/ga_artifact_patch.rb +22 -0
  44. data/lib/dapp/dimg/build/stage/ga_base.rb +80 -0
  45. data/lib/dapp/dimg/build/stage/ga_dependencies_base.rb +20 -0
  46. data/lib/dapp/dimg/build/stage/ga_latest_patch.rb +54 -0
  47. data/lib/dapp/dimg/build/stage/import_artifact.rb +64 -0
  48. data/lib/dapp/dimg/build/stage/install/ga_post_install_patch.rb +22 -0
  49. data/lib/dapp/dimg/build/stage/install/ga_post_install_patch_dependencies.rb +22 -0
  50. data/lib/dapp/dimg/build/stage/install/ga_pre_install_patch.rb +22 -0
  51. data/lib/dapp/dimg/build/stage/install/ga_pre_install_patch_dependencies.rb +22 -0
  52. data/lib/dapp/dimg/build/stage/install/install.rb +35 -0
  53. data/lib/dapp/dimg/build/stage/mod/group.rb +42 -0
  54. data/lib/dapp/dimg/build/stage/mod/logging.rb +101 -0
  55. data/lib/dapp/dimg/build/stage/setup/ga_post_setup_patch.rb +22 -0
  56. data/lib/dapp/dimg/build/stage/setup/ga_post_setup_patch_dependencies.rb +32 -0
  57. data/lib/dapp/dimg/build/stage/setup/ga_pre_setup_patch.rb +22 -0
  58. data/lib/dapp/dimg/build/stage/setup/ga_pre_setup_patch_dependencies.rb +22 -0
  59. data/lib/dapp/dimg/build/stage/setup/setup.rb +35 -0
  60. data/lib/dapp/dimg/builder.rb +6 -0
  61. data/lib/dapp/{builder → dimg/builder}/base.rb +4 -5
  62. data/lib/dapp/{builder → dimg/builder}/chef.rb +41 -33
  63. data/lib/dapp/dimg/builder/chef/berksfile.rb +121 -0
  64. data/lib/dapp/dimg/builder/chef/cookbook.rb +285 -0
  65. data/lib/dapp/dimg/builder/chef/cookbook_metadata.rb +106 -0
  66. data/lib/dapp/{builder → dimg/builder}/none.rb +4 -5
  67. data/lib/dapp/{builder → dimg/builder}/shell.rb +5 -6
  68. data/lib/dapp/dimg/cli/base.rb +16 -0
  69. data/lib/dapp/dimg/cli/bp.rb +37 -0
  70. data/lib/dapp/dimg/cli/build.rb +64 -0
  71. data/lib/dapp/dimg/cli/build_context.rb +18 -0
  72. data/lib/dapp/dimg/cli/build_context/export.rb +26 -0
  73. data/lib/dapp/dimg/cli/build_context/import.rb +17 -0
  74. data/lib/dapp/dimg/cli/cleanup.rb +22 -0
  75. data/lib/dapp/dimg/cli/cli.rb +1 -0
  76. data/lib/dapp/dimg/cli/dimg.rb +30 -0
  77. data/lib/dapp/dimg/cli/list.rb +17 -0
  78. data/lib/dapp/dimg/cli/mrproper.rb +26 -0
  79. data/lib/dapp/dimg/cli/push.rb +61 -0
  80. data/lib/dapp/dimg/cli/run.rb +59 -0
  81. data/lib/dapp/{cli → dimg/cli}/spush.rb +7 -7
  82. data/lib/dapp/dimg/cli/stage_image.rb +24 -0
  83. data/lib/dapp/dimg/cli/stages.rb +22 -0
  84. data/lib/dapp/dimg/cli/stages/cleanup_local.rb +44 -0
  85. data/lib/dapp/dimg/cli/stages/cleanup_repo.rb +26 -0
  86. data/lib/dapp/dimg/cli/stages/flush_local.rb +23 -0
  87. data/lib/dapp/dimg/cli/stages/flush_repo.rb +24 -0
  88. data/lib/dapp/dimg/cli/stages/pull.rb +28 -0
  89. data/lib/dapp/dimg/cli/stages/push.rb +24 -0
  90. data/lib/dapp/dimg/cli/tag.rb +24 -0
  91. data/lib/dapp/dimg/config/artifact_dimg.rb +17 -0
  92. data/lib/dapp/dimg/config/artifact_group.rb +47 -0
  93. data/lib/dapp/dimg/config/base.rb +7 -0
  94. data/lib/dapp/dimg/config/dimg.rb +24 -0
  95. data/lib/dapp/dimg/config/dimg/instance_methods.rb +177 -0
  96. data/lib/dapp/dimg/config/dimg/validation.rb +126 -0
  97. data/lib/dapp/dimg/config/dimg_group.rb +61 -0
  98. data/lib/dapp/dimg/config/dimg_group_base.rb +54 -0
  99. data/lib/dapp/dimg/config/dimg_group_main.rb +22 -0
  100. data/lib/dapp/dimg/config/directive/artifact.rb +70 -0
  101. data/lib/dapp/dimg/config/directive/artifact_base.rb +97 -0
  102. data/lib/dapp/dimg/config/directive/base.rb +9 -0
  103. data/lib/dapp/dimg/config/directive/chef.rb +68 -0
  104. data/lib/dapp/dimg/config/directive/docker/artifact.rb +15 -0
  105. data/lib/dapp/dimg/config/directive/docker/base.rb +22 -0
  106. data/lib/dapp/dimg/config/directive/docker/dimg.rb +82 -0
  107. data/lib/dapp/dimg/config/directive/git_artifact_local.rb +47 -0
  108. data/lib/dapp/dimg/config/directive/git_artifact_remote.rb +58 -0
  109. data/lib/dapp/dimg/config/directive/mount.rb +27 -0
  110. data/lib/dapp/dimg/config/directive/shell/artifact.rb +18 -0
  111. data/lib/dapp/dimg/config/directive/shell/dimg.rb +65 -0
  112. data/lib/dapp/dimg/dapp/command.rb +21 -0
  113. data/lib/dapp/dimg/dapp/command/bp.rb +20 -0
  114. data/lib/dapp/dimg/dapp/command/build.rb +22 -0
  115. data/lib/dapp/dimg/dapp/command/build_context/common.rb +27 -0
  116. data/lib/dapp/dimg/dapp/command/build_context/export.rb +55 -0
  117. data/lib/dapp/dimg/dapp/command/build_context/import.rb +71 -0
  118. data/lib/dapp/dimg/dapp/command/cleanup.rb +23 -0
  119. data/lib/dapp/dimg/dapp/command/common.rb +96 -0
  120. data/lib/dapp/dimg/dapp/command/list.rb +19 -0
  121. data/lib/dapp/dimg/dapp/command/mrproper.rb +75 -0
  122. data/lib/dapp/dimg/dapp/command/push.rb +27 -0
  123. data/lib/dapp/dimg/dapp/command/run.rb +15 -0
  124. data/lib/dapp/dimg/dapp/command/spush.rb +17 -0
  125. data/lib/dapp/dimg/dapp/command/stage_image.rb +14 -0
  126. data/lib/dapp/dimg/dapp/command/stages/cleanup_local.rb +137 -0
  127. data/lib/dapp/dimg/dapp/command/stages/cleanup_repo.rb +124 -0
  128. data/lib/dapp/dimg/dapp/command/stages/common.rb +85 -0
  129. data/lib/dapp/dimg/dapp/command/stages/flush_local.rb +21 -0
  130. data/lib/dapp/dimg/dapp/command/stages/flush_repo.rb +21 -0
  131. data/lib/dapp/dimg/dapp/command/stages/pull.rb +26 -0
  132. data/lib/dapp/dimg/dapp/command/stages/push.rb +22 -0
  133. data/lib/dapp/dimg/dapp/command/tag.rb +17 -0
  134. data/lib/dapp/dimg/dimg.rb +192 -0
  135. data/lib/dapp/dimg/dimg/git_artifact.rb +26 -0
  136. data/lib/dapp/dimg/dimg/path.rb +37 -0
  137. data/lib/dapp/dimg/dimg/stages.rb +60 -0
  138. data/lib/dapp/dimg/dimg/tags.rb +65 -0
  139. data/lib/dapp/dimg/docker_registry.rb +37 -0
  140. data/lib/dapp/dimg/docker_registry/base.rb +109 -0
  141. data/lib/dapp/dimg/docker_registry/base/authorization.rb +63 -0
  142. data/lib/dapp/dimg/docker_registry/base/request.rb +34 -0
  143. data/lib/dapp/dimg/docker_registry/default.rb +18 -0
  144. data/lib/dapp/dimg/error/base.rb +7 -0
  145. data/lib/dapp/dimg/error/build.rb +7 -0
  146. data/lib/dapp/dimg/error/chef.rb +11 -0
  147. data/lib/dapp/dimg/error/command.rb +7 -0
  148. data/lib/dapp/dimg/error/config.rb +7 -0
  149. data/lib/dapp/dimg/error/dimg.rb +7 -0
  150. data/lib/dapp/dimg/error/lock.rb +7 -0
  151. data/lib/dapp/dimg/error/registry.rb +7 -0
  152. data/lib/dapp/dimg/error/rugged.rb +7 -0
  153. data/lib/dapp/dimg/error/shellout.rb +7 -0
  154. data/lib/dapp/dimg/error/tar_writer.rb +7 -0
  155. data/lib/dapp/dimg/exception/base.rb +7 -0
  156. data/lib/dapp/dimg/exception/introspect_image.rb +7 -0
  157. data/lib/dapp/dimg/exception/registry.rb +7 -0
  158. data/lib/dapp/dimg/filelock.rb +43 -0
  159. data/lib/dapp/dimg/git_artifact.rb +241 -18
  160. data/lib/dapp/dimg/git_repo/base.rb +90 -0
  161. data/lib/dapp/dimg/git_repo/own.rb +39 -0
  162. data/lib/dapp/dimg/git_repo/remote.rb +50 -0
  163. data/lib/dapp/dimg/image/argument.rb +143 -0
  164. data/lib/dapp/dimg/image/docker.rb +127 -0
  165. data/lib/dapp/dimg/image/scratch.rb +32 -0
  166. data/lib/dapp/dimg/image/stage.rb +95 -0
  167. data/lib/dapp/dimg/lock/base.rb +51 -0
  168. data/lib/dapp/dimg/lock/file.rb +48 -0
  169. data/lib/dapp/error/base.rb +0 -1
  170. data/lib/dapp/error/dapp.rb +5 -0
  171. data/lib/dapp/error/dappfile.rb +0 -1
  172. data/lib/dapp/error/shellout.rb +0 -1
  173. data/lib/dapp/exception/base.rb +0 -1
  174. data/lib/dapp/helper/cli.rb +5 -6
  175. data/lib/dapp/helper/net_status.rb +0 -1
  176. data/lib/dapp/helper/sha256.rb +0 -1
  177. data/lib/dapp/helper/trivia.rb +0 -1
  178. data/lib/dapp/prctl.rb +0 -1
  179. data/lib/dapp/version.rb +1 -2
  180. metadata +172 -140
  181. data/lib/dapp/artifact.rb +0 -23
  182. data/lib/dapp/build/stage/after_install_artifact.rb +0 -13
  183. data/lib/dapp/build/stage/after_setup_artifact.rb +0 -17
  184. data/lib/dapp/build/stage/artifact_base.rb +0 -80
  185. data/lib/dapp/build/stage/artifact_default.rb +0 -63
  186. data/lib/dapp/build/stage/base.rb +0 -203
  187. data/lib/dapp/build/stage/before_install.rb +0 -32
  188. data/lib/dapp/build/stage/before_install_artifact.rb +0 -13
  189. data/lib/dapp/build/stage/before_setup.rb +0 -30
  190. data/lib/dapp/build/stage/before_setup_artifact.rb +0 -13
  191. data/lib/dapp/build/stage/build_artifact.rb +0 -36
  192. data/lib/dapp/build/stage/docker_instructions.rb +0 -24
  193. data/lib/dapp/build/stage/from.rb +0 -34
  194. data/lib/dapp/build/stage/ga_archive.rb +0 -27
  195. data/lib/dapp/build/stage/ga_archive_dependencies.rb +0 -26
  196. data/lib/dapp/build/stage/ga_artifact_patch.rb +0 -21
  197. data/lib/dapp/build/stage/ga_base.rb +0 -79
  198. data/lib/dapp/build/stage/ga_dependencies_base.rb +0 -19
  199. data/lib/dapp/build/stage/ga_latest_patch.rb +0 -53
  200. data/lib/dapp/build/stage/import_artifact.rb +0 -65
  201. data/lib/dapp/build/stage/install/ga_post_install_patch.rb +0 -21
  202. data/lib/dapp/build/stage/install/ga_post_install_patch_dependencies.rb +0 -21
  203. data/lib/dapp/build/stage/install/ga_pre_install_patch.rb +0 -21
  204. data/lib/dapp/build/stage/install/ga_pre_install_patch_dependencies.rb +0 -21
  205. data/lib/dapp/build/stage/install/install.rb +0 -40
  206. data/lib/dapp/build/stage/mod/group.rb +0 -42
  207. data/lib/dapp/build/stage/mod/logging.rb +0 -104
  208. data/lib/dapp/build/stage/setup/ga_post_setup_patch.rb +0 -21
  209. data/lib/dapp/build/stage/setup/ga_post_setup_patch_dependencies.rb +0 -31
  210. data/lib/dapp/build/stage/setup/ga_pre_setup_patch.rb +0 -21
  211. data/lib/dapp/build/stage/setup/ga_pre_setup_patch_dependencies.rb +0 -21
  212. data/lib/dapp/build/stage/setup/setup.rb +0 -40
  213. data/lib/dapp/builder/chef/berksfile.rb +0 -78
  214. data/lib/dapp/builder/chef/cookbook.rb +0 -257
  215. data/lib/dapp/builder/chef/cookbook_metadata.rb +0 -54
  216. data/lib/dapp/builder/chef/error.rb +0 -12
  217. data/lib/dapp/cli/bp.rb +0 -37
  218. data/lib/dapp/cli/build.rb +0 -60
  219. data/lib/dapp/cli/cleanup.rb +0 -22
  220. data/lib/dapp/cli/list.rb +0 -17
  221. data/lib/dapp/cli/mrproper.rb +0 -26
  222. data/lib/dapp/cli/push.rb +0 -61
  223. data/lib/dapp/cli/run.rb +0 -53
  224. data/lib/dapp/cli/stage_image.rb +0 -24
  225. data/lib/dapp/cli/stages.rb +0 -23
  226. data/lib/dapp/cli/stages/cleanup_local.rb +0 -44
  227. data/lib/dapp/cli/stages/cleanup_repo.rb +0 -26
  228. data/lib/dapp/cli/stages/flush_local.rb +0 -23
  229. data/lib/dapp/cli/stages/flush_repo.rb +0 -24
  230. data/lib/dapp/cli/stages/pull.rb +0 -28
  231. data/lib/dapp/cli/stages/push.rb +0 -24
  232. data/lib/dapp/cli/tag.rb +0 -24
  233. data/lib/dapp/config/artifact_dimg.rb +0 -20
  234. data/lib/dapp/config/artifact_group.rb +0 -56
  235. data/lib/dapp/config/dimg.rb +0 -23
  236. data/lib/dapp/config/dimg/instance_methods.rb +0 -194
  237. data/lib/dapp/config/dimg/validation.rb +0 -125
  238. data/lib/dapp/config/dimg_group.rb +0 -60
  239. data/lib/dapp/config/dimg_group_base.rb +0 -53
  240. data/lib/dapp/config/dimg_group_main.rb +0 -21
  241. data/lib/dapp/config/directive/artifact.rb +0 -69
  242. data/lib/dapp/config/directive/artifact_base.rb +0 -93
  243. data/lib/dapp/config/directive/chef.rb +0 -57
  244. data/lib/dapp/config/directive/docker/artifact.rb +0 -15
  245. data/lib/dapp/config/directive/docker/base.rb +0 -20
  246. data/lib/dapp/config/directive/docker/dimg.rb +0 -81
  247. data/lib/dapp/config/directive/git_artifact_local.rb +0 -13
  248. data/lib/dapp/config/directive/git_artifact_remote.rb +0 -57
  249. data/lib/dapp/config/directive/mount.rb +0 -26
  250. data/lib/dapp/config/directive/shell/artifact.rb +0 -17
  251. data/lib/dapp/config/directive/shell/dimg.rb +0 -65
  252. data/lib/dapp/dimg/path.rb +0 -37
  253. data/lib/dapp/dimg/stages.rb +0 -59
  254. data/lib/dapp/dimg/tags.rb +0 -65
  255. data/lib/dapp/docker_registry.rb +0 -36
  256. data/lib/dapp/docker_registry/base.rb +0 -109
  257. data/lib/dapp/docker_registry/default.rb +0 -18
  258. data/lib/dapp/docker_registry/mod/authorization.rb +0 -63
  259. data/lib/dapp/docker_registry/mod/request.rb +0 -32
  260. data/lib/dapp/error/build.rb +0 -6
  261. data/lib/dapp/error/config.rb +0 -6
  262. data/lib/dapp/error/dimg.rb +0 -6
  263. data/lib/dapp/error/image.rb +0 -6
  264. data/lib/dapp/error/project.rb +0 -6
  265. data/lib/dapp/error/registry.rb +0 -6
  266. data/lib/dapp/error/rugged.rb +0 -6
  267. data/lib/dapp/error/tar_writer.rb +0 -6
  268. data/lib/dapp/exception/introspect_image.rb +0 -6
  269. data/lib/dapp/exception/registry.rb +0 -6
  270. data/lib/dapp/filelock.rb +0 -43
  271. data/lib/dapp/git_artifact.rb +0 -241
  272. data/lib/dapp/git_repo/base.rb +0 -88
  273. data/lib/dapp/git_repo/own.rb +0 -38
  274. data/lib/dapp/git_repo/remote.rb +0 -49
  275. data/lib/dapp/image/argument.rb +0 -134
  276. data/lib/dapp/image/docker.rb +0 -115
  277. data/lib/dapp/image/scratch.rb +0 -32
  278. data/lib/dapp/image/stage.rb +0 -94
  279. data/lib/dapp/lock/base.rb +0 -51
  280. data/lib/dapp/lock/error.rb +0 -14
  281. data/lib/dapp/lock/file.rb +0 -45
  282. data/lib/dapp/project/command/bp.rb +0 -21
  283. data/lib/dapp/project/command/build.rb +0 -20
  284. data/lib/dapp/project/command/cleanup.rb +0 -24
  285. data/lib/dapp/project/command/common.rb +0 -96
  286. data/lib/dapp/project/command/list.rb +0 -20
  287. data/lib/dapp/project/command/mrproper.rb +0 -69
  288. data/lib/dapp/project/command/push.rb +0 -28
  289. data/lib/dapp/project/command/run.rb +0 -15
  290. data/lib/dapp/project/command/spush.rb +0 -18
  291. data/lib/dapp/project/command/stage_image.rb +0 -15
  292. data/lib/dapp/project/command/stages/cleanup_local.rb +0 -138
  293. data/lib/dapp/project/command/stages/cleanup_repo.rb +0 -125
  294. data/lib/dapp/project/command/stages/common.rb +0 -86
  295. data/lib/dapp/project/command/stages/flush_local.rb +0 -22
  296. data/lib/dapp/project/command/stages/flush_repo.rb +0 -22
  297. data/lib/dapp/project/command/stages/pull.rb +0 -27
  298. data/lib/dapp/project/command/stages/push.rb +0 -23
  299. data/lib/dapp/project/command/tag.rb +0 -18
@@ -1,7 +1,6 @@
1
1
  module Dapp
2
2
  class CLI
3
- # Base of CLI subcommands
4
- class Base < CLI
3
+ class Base < ::Dapp::CLI
5
4
  option :dir,
6
5
  long: '--dir PATH',
7
6
  description: 'Change to directory',
@@ -56,9 +55,8 @@ module Dapp
56
55
  super()
57
56
  end
58
57
 
59
- def run(argv = ARGV)
60
- self.class.parse_options(self, argv)
61
- Project.new(cli_options: config, dimgs_patterns: cli_arguments).public_send(class_to_lowercase)
58
+ def run(_argv = ARGV)
59
+ raise
62
60
  end
63
61
  end
64
62
  end
@@ -1,19 +1,22 @@
1
1
  module Dapp
2
2
  module Config
3
- # Base
4
3
  class Base
5
- def initialize(project:, &blk)
6
- @project = project
4
+ def initialize(dapp:, &blk)
5
+ @dapp = dapp
7
6
  instance_eval(&blk) if block_given?
8
7
  end
9
8
 
10
9
  protected
11
10
 
12
- attr_reader :project
11
+ attr_reader :dapp
12
+
13
+ def ref_variables
14
+ [:@dapp]
15
+ end
13
16
 
14
17
  def marshal_dump
15
18
  instance_variables
16
- .reject {|variable| variable == :@project}
19
+ .reject {|variable| ref_variables.include? variable}
17
20
  .map {|variable| [variable, instance_variable_get(variable)]}
18
21
  end
19
22
 
@@ -26,11 +29,20 @@ module Dapp
26
29
  end
27
30
 
28
31
  def _clone
29
- Marshal.load Marshal.dump(self)
32
+ Marshal.load(Marshal.dump(self)).tap do |obj|
33
+ _set_ref_variables_to(obj)
34
+ end
30
35
  end
31
36
 
32
37
  def _clone_to(obj)
33
- obj.marshal_load marshal_dump
38
+ obj.marshal_load(marshal_dump)
39
+ _set_ref_variables_to(obj)
40
+ end
41
+
42
+ def _set_ref_variables_to(obj)
43
+ ref_variables.each do |ref_variable|
44
+ obj.instance_variable_set(ref_variable, instance_variable_get(ref_variable))
45
+ end
34
46
  end
35
47
  end
36
48
  end
@@ -1,7 +1,6 @@
1
1
  module Dapp
2
2
  module Config
3
3
  module Directive
4
- # Base
5
4
  class Base < Config::Base
6
5
  protected
7
6
 
@@ -0,0 +1,7 @@
1
+ module Dapp
2
+ module Config
3
+ module Error
4
+ class Config < ::Dapp::Error::Base; end
5
+ end
6
+ end
7
+ end
@@ -1,7 +1,5 @@
1
1
  module Dapp
2
- # CoreExt
3
2
  module CoreExt
4
- # Hash
5
3
  module Hash
6
4
  def in_depth_merge(hash) # do not conflict with activesupport`s deep_merge
7
5
  merge(hash) do |_, v1, v2|
@@ -1,7 +1,5 @@
1
1
  module Dapp
2
- # CoreExt
3
2
  module CoreExt
4
- # Pathname
5
3
  module Pathname
6
4
  def subpath_of?(another_path)
7
5
  another_path_descends = []
@@ -10,7 +8,7 @@ module Dapp
10
8
  path_descends = []
11
9
  cleanpath.descend {|d| path_descends << d}
12
10
 
13
- (path_descends & another_path_descends) == another_path_descends and
11
+ (path_descends & another_path_descends) == another_path_descends &&
14
12
  (path_descends - another_path_descends).any?
15
13
  end
16
14
 
@@ -1,29 +1,10 @@
1
1
  module Dapp
2
- # Project
3
- class Project
2
+ class Dapp
4
3
  include Lock
5
4
  include GitArtifact
6
5
  include Dappfile
7
6
  include Chef
8
7
 
9
- include Command::Common
10
- include Command::Run
11
- include Command::Build
12
- include Command::Bp
13
- include Command::Push
14
- include Command::Spush
15
- include Command::Tag
16
- include Command::List
17
- include Command::Stages::CleanupLocal
18
- include Command::Stages::CleanupRepo
19
- include Command::Stages::FlushLocal
20
- include Command::Stages::FlushRepo
21
- include Command::Stages::Push
22
- include Command::Stages::Pull
23
- include Command::Stages::Common
24
- include Command::Cleanup
25
- include Command::Mrproper
26
- include Command::StageImage
27
8
  include Logging::Base
28
9
  include Logging::Process
29
10
  include Logging::I18n
@@ -115,5 +96,5 @@ module Dapp
115
96
  def dev_mode?
116
97
  !!cli_options[:dev]
117
98
  end
118
- end # Project
99
+ end # Dapp
119
100
  end # Dapp
@@ -1,7 +1,5 @@
1
1
  module Dapp
2
- # Project
3
- class Project
4
- # Chef
2
+ class Dapp
5
3
  module Chef
6
4
  def local_git_artifact_exclude_paths(&blk)
7
5
  super do |exclude_paths|
@@ -15,5 +13,5 @@ module Dapp
15
13
  Pathname.new(path).join('.dapp_chef')
16
14
  end
17
15
  end # Chef
18
- end # Project
16
+ end # Dapp
19
17
  end # Dapp
@@ -1,7 +1,5 @@
1
1
  module Dapp
2
- # Project
3
- class Project
4
- # Dappfile
2
+ class Dapp
5
3
  module Dappfile
6
4
  def local_git_artifact_exclude_paths(&blk)
7
5
  super do |exclude_paths|
@@ -14,13 +12,13 @@ module Dapp
14
12
  def build_configs
15
13
  @configs ||= begin
16
14
  dimgs(dappfile_path).flatten.tap do |dimgs|
17
- raise Error::Project, code: :no_such_dimg, data: { dimgs_patterns: dimgs_patterns.join(', ') } if dimgs.empty?
15
+ raise Error::Dapp, code: :no_such_dimg, data: { dimgs_patterns: dimgs_patterns.join(', ') } if dimgs.empty?
18
16
  end
19
17
  end
20
18
  end
21
19
 
22
20
  def dappfile_path
23
- raise Error::Project, code: :dappfile_not_found unless (dappfile_path = search_file_upward('Dappfile'))
21
+ raise Error::Dapp, code: :dappfile_not_found unless (dappfile_path = search_file_upward('Dappfile'))
24
22
  dappfile_path
25
23
  end
26
24
 
@@ -35,7 +33,7 @@ module Dapp
35
33
  end
36
34
 
37
35
  def dimgs(dappfile_path)
38
- Config::DimgGroupMain.new(project: self) do |conf|
36
+ Dimg::Config::DimgGroupMain.new(dapp: self) do |conf|
39
37
  begin
40
38
  conf.instance_eval File.read(dappfile_path), dappfile_path
41
39
  rescue SyntaxError, StandardError => e
@@ -58,5 +56,5 @@ module Dapp
58
56
  end
59
57
  end
60
58
  end # Dappfile
61
- end # Project
59
+ end # Dapp
62
60
  end # Dapp
@@ -1,9 +1,6 @@
1
1
  module Dapp
2
- # Project
3
- class Project
4
- # Deps
2
+ class Dapp
5
3
  module Deps
6
- # Base
7
4
  module Base
8
5
  BASE_VERSION = '0.1.14'.freeze
9
6
 
@@ -26,7 +23,7 @@ module Dapp
26
23
  end
27
24
  end
28
25
 
29
- %w(rsync diff date cat
26
+ %w(rm rsync diff date cat
30
27
  stat sleep mkdir find
31
28
  install sed cp true
32
29
  bash tar sudo).each do |cmd|
@@ -48,5 +45,5 @@ module Dapp
48
45
  end
49
46
  end # Base
50
47
  end # Deps
51
- end # Project
48
+ end # Dapp
52
49
  end # Dapp
@@ -1,9 +1,6 @@
1
1
  module Dapp
2
- # Project
3
- class Project
4
- # Deps
2
+ class Dapp
5
3
  module Deps
6
- # Gitartifact
7
4
  module Gitartifact
8
5
  GITARTIFACT_VERSION = '0.1.7'.freeze
9
6
 
@@ -32,5 +29,5 @@ module Dapp
32
29
  end
33
30
  end # Gitartifact
34
31
  end # Deps
35
- end # Project
32
+ end # Dapp
36
33
  end # Dapp
@@ -1,7 +1,5 @@
1
1
  module Dapp
2
- # Project
3
- class Project
4
- # GitArtifact
2
+ class Dapp
5
3
  module GitArtifact
6
4
  def local_git_artifact_exclude_paths(&blk)
7
5
  @local_git_artifact_exclude_paths ||= [].tap do |exclude_paths|
@@ -9,5 +7,5 @@ module Dapp
9
7
  end
10
8
  end
11
9
  end # GitArtifact
12
- end # Project
10
+ end # Dapp
13
11
  end # Dapp
@@ -1,7 +1,5 @@
1
1
  module Dapp
2
- # Project
3
- class Project
4
- # Lock
2
+ class Dapp
5
3
  module Lock
6
4
  def lock_path
7
5
  build_path.join('locks')
@@ -9,7 +7,7 @@ module Dapp
9
7
 
10
8
  def _lock(name)
11
9
  @_locks ||= {}
12
- @_locks[name] ||= ::Dapp::Lock::File.new(lock_path, name)
10
+ @_locks[name] ||= ::Dapp::Dimg::Lock::File.new(lock_path, name)
13
11
  end
14
12
 
15
13
  def lock(name, *_args, default_timeout: 300, **kwargs, &blk)
@@ -30,5 +28,5 @@ module Dapp
30
28
  end
31
29
  end
32
30
  end # Lock
33
- end # Project
31
+ end # Dapp
34
32
  end # Dapp
@@ -1,9 +1,6 @@
1
1
  module Dapp
2
- # Project
3
- class Project
4
- # Logging
2
+ class Dapp
5
3
  module Logging
6
- # Base
7
4
  module Base
8
5
  def log_quiet?
9
6
  cli_options[:log_quiet]
@@ -139,5 +136,5 @@ module Dapp
139
136
  end
140
137
  end
141
138
  end # Logging
142
- end # Project
139
+ end # Dapp
143
140
  end # Dapp
@@ -1,10 +1,9 @@
1
1
  module Dapp
2
- class Project
2
+ class Dapp
3
3
  module Logging
4
- # I18n
5
4
  module I18n
6
5
  def self.initialize
7
- ::I18n.load_path << Dir[File.join(Dapp.root, 'config', '**', '*')].select { |path| File.file?(path) }
6
+ ::I18n.load_path << Dir[File.join(::Dapp.root, 'config', '**', '*')].select { |path| File.file?(path) }
8
7
  ::I18n.reload!
9
8
  ::I18n.locale = :en
10
9
  end
@@ -1,8 +1,6 @@
1
1
  module Dapp
2
- # Project
3
- class Project
2
+ class Dapp
4
3
  module Logging
5
- # Paint
6
4
  module Paint
7
5
  FORMAT = {
8
6
  step: [:yellow, :bold],
@@ -43,5 +41,5 @@ module Dapp
43
41
  end
44
42
  end # Paint
45
43
  end
46
- end # Project
44
+ end # Dapp
47
45
  end # Dapp
@@ -1,9 +1,6 @@
1
1
  module Dapp
2
- # Project
3
- class Project
4
- # Logging
2
+ class Dapp
5
3
  module Logging
6
- # Process
7
4
  module Process
8
5
  DEFAULT_STYLE = {
9
6
  message: :step,
@@ -107,5 +104,5 @@ module Dapp
107
104
  end
108
105
  end
109
106
  end # Logging
110
- end # Project
107
+ end # Dapp
111
108
  end # Dapp
@@ -1,8 +1,6 @@
1
1
  module Dapp
2
- class Project
3
- # Shellout
2
+ class Dapp
4
3
  module Shellout
5
- # Base
6
4
  module Base
7
5
  include Streaming
8
6
 
@@ -52,7 +50,7 @@ module Dapp
52
50
  protected
53
51
 
54
52
  def shellout_with_logging(log_verbose: false, **kwargs)
55
- return yield(**kwargs) unless instance_of? Project
53
+ return yield(**kwargs) unless instance_of? Dapp
56
54
 
57
55
  begin
58
56
  stream = Stream.new
@@ -1,9 +1,7 @@
1
1
  module Dapp
2
- class Project
2
+ class Dapp
3
3
  module Shellout
4
- # Streaming
5
4
  module Streaming
6
- # Stream
7
5
  class Stream
8
6
  def buffer
9
7
  @buffer ||= []
@@ -18,9 +16,7 @@ module Dapp
18
16
  end
19
17
  end
20
18
 
21
- # Proxy
22
19
  module Proxy
23
- # Base
24
20
  class Base
25
21
  def initialize(*streams, with_time: false)
26
22
  @streams = streams
@@ -32,14 +28,13 @@ module Dapp
32
28
  end
33
29
 
34
30
  def format_string(str)
35
- str.lines.map { |l| "#{Project.log_time if @with_time}#{l.strip}\n" }.join
31
+ str.lines.map { |l| "#{Dapp.log_time if @with_time}#{l.strip}\n" }.join
36
32
  end
37
33
  end
38
34
 
39
- # Error
40
35
  class Error < Base
41
36
  def format_string(str)
42
- "#{Project.paint_string(super.strip, :warning)}\n"
37
+ "#{Dapp.paint_string(super.strip, :warning)}\n"
43
38
  end
44
39
  end
45
40
  end
@@ -1,16 +1,14 @@
1
1
  module Dapp
2
- # Project
3
- class Project
4
- # SshAgent
2
+ class Dapp
5
3
  module SshAgent
6
4
  class << self
7
5
  def included(_base)
8
- ::Dapp::Project::Shellout::Base.default_env_keys << 'SSH_AUTH_SOCK'
6
+ ::Dapp::Dapp::Shellout::Base.default_env_keys << 'SSH_AUTH_SOCK'
9
7
  end
10
8
  end # << self
11
9
 
12
10
  def run_ssh_agent
13
- raise 'Cannot fork dapp process: there are active file locks' unless ::Dapp::Lock::File.counter.zero?
11
+ raise 'Cannot fork dapp process: there are active file locks' unless ::Dapp::Dimg::Lock::File.counter.zero?
14
12
 
15
13
  sock_name = "dapp-ssh-#{SecureRandom.uuid}"
16
14
 
@@ -39,7 +37,7 @@ module Dapp
39
37
  sleep 0.001 until File.exist? sock_path
40
38
  end
41
39
  rescue ::Timeout::Error
42
- raise ::Dapp::Error::Project, code: :cannot_run_ssh_agent
40
+ raise Error::Dapp, code: :cannot_run_ssh_agent
43
41
  end
44
42
  end # sock_path
45
43
  end
@@ -65,13 +63,12 @@ module Dapp
65
63
  return unless cli_options[:ssh_key]
66
64
 
67
65
  cli_options[:ssh_key].each do |ssh_key|
68
- raise ::Dapp::Error::Project, code: :ssh_key_not_found,
69
- data: { path: ssh_key } unless File.exist? ssh_key
66
+ raise Error::Dapp, code: :ssh_key_not_found, data: { path: ssh_key } unless File.exist? ssh_key
70
67
 
71
68
  File.chmod 0o600, ssh_key
72
69
  add_ssh_key ssh_key
73
70
  end
74
71
  end
75
72
  end # SshAgent
76
- end # Project
73
+ end # Dapp
77
74
  end # Dapp