lib/makit.rb in makit-0.0.21 vs lib/makit.rb in makit-0.0.22

- old
+ new

@@ -13,23 +13,23 @@ module Makit class Error < StandardError; end # Constants -if File.exist? ".makit.project.json" - PROJECT = Makit::Serializer.open(".makit.project.json", Makit::V1::Project) -else - if File.exist? ".makit.project.yml" - PROJECT = Makit::Serializer.open(".makit.project.yml", Makit::V1::Project) + if File.exist? ".makit.project.json" + PROJECT = Makit::Serializer.open(".makit.project.json", Makit::V1::Project) else - PROJECT = Makit::V1::Project.new - PROJECT.set_default_values + if File.exist? ".makit.project.yml" + PROJECT = Makit::Serializer.open(".makit.project.yml", Makit::V1::Project) + else + PROJECT = Makit::V1::Project.new + PROJECT.set_default_values + end end -end - STARTTIME = Time.now + IS_GIT_REPO = Dir.exist? ".git" DETACHED = `git status`.include?("detached") IS_READ_ONLY = !IS_GIT_REPO || DETACHED RUNTIME_IDENTIFIER = Makit::Environment::get_runtime_identifier DEVICE = Socket.gethostname @@ -38,9 +38,10 @@ # Git Commit and Branch/Tag constants ENV["COMMIT_SHA"] = Makit::Git::commitsha ENV["COMMIT_BRANCH"] = Makit::Git::branch RUNNER = CommandRunner.new + GIT_FILE_INFOS = Makit::Git::get_file_infos #RUNNER.log_to_artifacts = true # Variables log_level = Logger::INFO package_type = Makit::V1::PackageType::GEM commands = Makit::Commands.new