ive 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 015d8fb59ae4758db9508bae233722c8c5238c89
-  data.tar.gz: d6042d5742f343f72be768608e4dd911fff2a4d1
+  metadata.gz: 3ba6659ffeef58918b087ba34e4c51f7e9d7fb4b
+  data.tar.gz: 3393a6122c68145e7f472dd568077b454aefa660
 SHA512:
-  metadata.gz: 6803bc25f0215b93856bf3720906498ef534a3ef24a84e8cb4aaa5e298bba90ae0a7c5f4b24822e44a978b17018206ed573b72ab3578952a23944245b958c28f
-  data.tar.gz: 333ed3d51bd9b654f2fede17eef82cce1c1cff54762b621fb5de7a40c63e4764f36b165f26f7a70b28b59accbd77c9d8cf76af9ee11e3d0a43adeee64aa1788d
+  metadata.gz: 4aebcc64b4deb82ebc5683f70d3eb1a9c16c5401c8379f29971cea7bcc09370c2655091ce1190b7eab14f6047912fcc45e609f03e28a3e65048bb09f6d1b3e6d
+  data.tar.gz: 212171dcae1108f362d08e2c9e06e4abf74f7cc5199c3691d4a3d20a808d56755bf198ed1bdebd3beb15b1348ce0d77828dbfd1b64d33850daad653b89b2cb98

data/README.md

@@ -52,11 +52,19 @@ Here is an example of the configuration file.
     target: "TheProject"
     configuration: "Debug"
 
+If a .ive configuration file is missing you can easlily generate one with his command.
+
+    ive setup
+
 It's also possible to check out the current version.
 
     ive version
     ive version -p ~/Project
 
+Set the initial version to 1.0.0 with a build number 0001.
+
+    ive init
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/ive/fork )

data/bin/ive

@@ -27,6 +27,20 @@ class IveRunner < Thor
     Ive::Base.new.version
   end
 
+  desc "init", "Initialize the version to 1.0.0 for the current project."
+  method_option :path, :aliases => "-p", :desc => "Supply the path where the project is located"
+  def init
+    ENV["IVE_PATH"] = options[:path]
+    Ive::Base.new.initialize_version git?
+  end
+
+  desc "setup", "Create the .ive configuration file for the current project."
+  method_option :path, :aliases => "-p", :desc => "Supply the path where the project is located"
+  def setup
+    ENV["IVE_PATH"] = options[:path]
+    Ive::Base.new.setup
+  end
+
   private
 
   def git?

data/lib/ive/base.rb

@@ -3,7 +3,7 @@ require "xcoder"
 module Ive
   class Base
       def list
-        puts "-- Ive supports the following version bumps:"
+        puts "Ive supports the following version bumps:"
         puts "- major"
         puts "- minor"
         puts "- patch"
@@ -11,28 +11,78 @@ module Ive
       end
 
       def bump(type, git=false)
-        if config = Ive::Xcode.new.config
-          if git
-            if Git.changes?
-              puts "-- This repository has uncommited changes please commit these changes before performing a version bump."
-            else
+        fetch_config do |config|
+          use_git git do
+            if git
               version = Bump.public_send(type, config)
               Git.commit version
+            else
+              Bump.public_send(type, config)
+            end
+          end
+        end
+      end
+
+      def initialize_version git=false
+        fetch_config do |config|
+          use_git git do
+            if git
+              version = Bump.initialize_version config
+              Git.commit version
+            else
+              Bump.initialize_version config
             end
+          end
+        end
+      end
+
+      def setup
+        xcode = Ive::Xcode.new
+        if xcode
+          configuration = Configuration.new
+          if configuration.valid?
+            puts "-- An .ive configuration file is already set."
           else
-            Bump.public_send(type, config)
+            config_params = xcode.initial_config
+            if config_params
+              Configuration.new.create_file(config_params) 
+              puts "-- .ive configuration file generated"
+            end
           end
         else
-          puts "-- No project file found"
+          puts "-- No project file found."
         end
       end
 
       def version
-        if config = Ive::Xcode.new.config
-          puts "-- Version #{config.info_plist.marketing_version}"
-          puts "-- Build version #{config.info_plist.version}"
+        fetch_config do |config|
+          puts "-- Current version #{config.info_plist.marketing_version}"
+          puts "-- Current build version #{config.info_plist.version}"
+        end
+      end
+
+      private
+
+      def fetch_config &block
+        xcode = Ive::Xcode.new
+        if config = xcode.config
+          yield config if block_given?
+        elsif xcode
+          puts "-- .ive configuration file missing or invalid."
+        else
+          puts "-- No project file found."
+        end
+      end
+
+      def use_git enabled, &block
+        if enabled
+          if Git.changes?
+            puts "-- This repository has uncommited changes please commit these changes before performing a version bump."
+          else
+            yield if block_given?
+          end
         else
-          puts "-- No project file found"
+          yield if block_given?
         end
       end
     end

data/lib/ive/bump.rb

@@ -19,6 +19,20 @@ module Ive
         bumped_build_version config
       end
 
+      def initialize_version config
+        version = Versionomy.parse "1.0.0"
+        config.info_plist do |info|
+          info.marketing_version = version.to_s
+          info.version = build_version_from info.marketing_version, 1
+          info.save
+        end
+        puts "-- Current version #{config.info_plist.marketing_version}"
+        puts "-- Current build version #{config.info_plist.version}"
+
+        new_version = "v#{config.info_plist.marketing_version}"
+        new_version
+      end
+
       private
       
       def bumped_version config, type
@@ -28,6 +42,8 @@ module Ive
           info.version = build_version_from info.marketing_version, 1
           info.save
         end
+        puts "-- Current version #{config.info_plist.marketing_version}"
+        puts "-- Current build version #{config.info_plist.version}"
 
         new_version = "v#{config.info_plist.marketing_version}"
         new_version
@@ -40,6 +56,8 @@ module Ive
           info.version = build_version_from info.marketing_version, new_build_version + 1
           info.save
         end
+        puts "-- Current version #{config.info_plist.marketing_version}"
+        puts "-- Current build version #{config.info_plist.version}"
       end
 
       def build_version_from version, count

data/lib/ive/configuration.rb

@@ -7,20 +7,19 @@ module Ive
     attr :configuration
 
     def initialize
-      if self.exists?
-        self.read_config
-        unless self.valid?
-          puts "-- Invalid .ive config file."
-        end
-      else
-        puts "-- No .ive config file found."
-      end
+      self.read_config if self.exists?
+    end
+
+    def create_file xcode_params
+      File.open(config_path, "w") { |f| f.write(initial_content(xcode_params)) } unless exists?
     end
 
     def read_config
       params = YAML::load File.open(self.config_path)
-      @target = params["target"]
-      @configuration = params["configuration"]
+      if params
+        @target = params["target"]
+        @configuration = params["configuration"]
+      end
     end
 
     def valid?
@@ -34,5 +33,12 @@ module Ive
     def config_path
       @config_path ||= File.join(Ive.path,'.ive')
     end
+
+    def initial_content xcode_params
+      <<TEXT
+target: "#{xcode_params[:target]}"
+configuration: "#{xcode_params[:configuration]}"
+TEXT
+    end
   end
 end

data/lib/ive/version.rb

@@ -1,3 +1,3 @@
 module Ive
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/ive/xcode.rb

@@ -6,8 +6,21 @@ module Ive
       return nil unless Ive.config.valid?
 
       project.target(Ive.config.target).config(Ive.config.configuration)
-    #rescue Exception => e
-      #nil
+    rescue Exception => e
+      puts "-- #{e.message}"
+      nil
+    end
+
+    def initial_config
+      if project.targets.count > 0 && (target = project.targets.first)
+        if target.configs.count > 0 && (config = target.configs.first)
+          { target: target.name, configuration: config.name }
+        else
+          puts "-- No configurations found for target '#{target.name}' in the current project"
+        end
+      else
+        puts "-- No targets found in the current project"
+      end
     end
 
     def project

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ive
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jelle Vandebeeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler