fwtoolkit 0.9.3 → 1.0.1

data/lib/fwtoolkit/projectfile.rb

@@ -0,0 +1,50 @@
+require 'yaml'
+require 'fwtoolkit/configfile'
+
+module FWToolkit
+  module Projectfile
+    extend self #singleton 
+   
+    extend FWToolkit::ConfigFile
+ 
+    def load!(project_root)
+      load_config! projectfile_for_root(project_root)
+      merge_config defaults_with_config(@config)
+    end
+
+    def load_with_config!(config)
+      load_config_hash! config
+      merge_config defaults_with_config(config)
+    end
+
+    def validate_config
+      unless @config.has_key?(:project_name) && @config.has_key?(:class_prefix)
+        raise NameError, "The project name has to be specified on the configuration file"
+      end
+    end
+
+
+    private
+
+    def projectfile_for_root(project_root)
+      File.join project_root, 'FWProjectFile'
+    end
+
+    def defaults_with_config(conf_hash)
+      d = Hash.new
+      d[:target_name] = conf_hash[:target_name] || conf_hash[:project_name]
+      d[:binary_name] = "#{conf_hash[:project_name]}"
+      d[:tests_target_name] = conf_hash[:tests_target_name] || "#{conf_hash[:project_name]}Tests"
+      d[:xcode_workspace] = "#{conf_hash[:project_name]}.xcworkspace" 
+      d[:xcode_scheme] = { :dev => conf_hash[:project_name], 
+                           :testing => "#{conf_hash[:project_name]}-Testing",
+                           :release => "#{conf_hash[:project_name]}-Release" }
+      d[:xcode_project] = "#{File.join(conf_hash[:project_name], conf_hash[:project_name])}.xcodeproj" 
+      d[:source_root] = File.join conf_hash[:project_name], d[:target_name]  
+      d[:tests_source_root] = File.join conf_hash[:project_name], d[:tests_target_name] 
+      d[:frank_root] = File.join conf_hash[:project_name], d[:target_name], 'Frank' 
+      d[:frankified_app] = File.join d[:frank_root], 'frankified_build', 'Frankified.app'
+      d
+    end
+  end
+end

data/lib/fwtoolkit/rake/ext/rake.rb

@@ -0,0 +1,7 @@
+require 'rake'
+
+class Rake::Task
+  def enhance_r(&block)
+    @actions.unshift(block) if block_given?
+  end
+end

data/lib/fwtoolkit/rake/tasks/ci.rb

@@ -0,0 +1,25 @@
+require 'rake'
+require 'fwtoolkit/projectfile'
+
+module FWToolkit
+  module Rake
+    class CITask < ::Rake::Task
+      include ::Rake::DSL if defined?(::Rake::DSL)
+      include Config
+      def initialize(&block)
+        yield self if block_given?
+        define_task
+      end
+
+
+      private
+
+      def define_task
+        namespace :ci do
+          desc 'Build'
+          task :build => ['project:update', 'xcode:ci:testing', 'test:build', 'test:ci:frank']
+        end
+      end
+    end
+  end
+end

data/lib/fwtoolkit/rake/tasks/config.rb

@@ -0,0 +1,13 @@
+module FWToolkit
+  module Rake
+    module Config
+
+      def projectfile_path=(path)
+        @projectfile_path = path
+      end
+      def projectfile_path
+        @projectfile_path ||= Dir.pwd
+      end
+    end
+  end
+end

data/lib/fwtoolkit/rake/tasks/ota.rb

@@ -0,0 +1,31 @@
+# require 'rake'
+# require 'fwtoolkit/projectfile'
+# require 'fwtoolkit/config'
+# require 'motion-hockeyapp'
+# 
+# module FWToolkit
+#   module Rake
+#     class OTATask < Rake::Task
+#       include ::Rake::DSL if definied?(::Rare::DSL)
+# 
+#       def initialize(&block)
+#         yield self if block_given?
+#         define_task
+#       end
+#       
+#       
+#       private
+# 
+#       def define_task
+#         namespace :ota do
+#           desc 'Build IPA file'
+#           task :build_ipa do
+#             run! "xcrun -sdk 'iphoneos' PackageApplication -v '/tmp/artifacts/Applications/#{scheme}.app' -o '/tmp/artifacts/Applications/#{scheme}.ipa' --sign '#{certificate}' --embed '#{provisioning_profile}'"
+#             sh command
+#           end   
+#         end
+# 
+#         Need more schemes: debug, testing (releaseota), release all optional
+#       end
+#   end
+# end

data/lib/fwtoolkit/rake/tasks/project.rb

@@ -0,0 +1,28 @@
+require 'rake'
+require 'fwtoolkit/rake/tasks/config'
+require 'fwtoolkit/projectfile'
+
+module FWToolkit
+  module Rake
+    class ProjectTask < ::Rake::Task
+      include ::Rake::DSL if defined?(::Rake::DSL)
+      include Config
+      def initialize(&block)
+        yield self if block_given?
+        define_task
+      end
+
+
+      private
+
+      def define_task
+        namespace :project do
+          desc 'Update pods/gems and submodules'
+          task :update do
+            `fwt proj update`
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fwtoolkit/rake/tasks/test.rb

@@ -0,0 +1,59 @@
+require 'rake'
+require 'fwtoolkit/rake/ext/rake'
+
+require 'fwtoolkit/rake/tasks/config'
+require 'fwtoolkit/projectfile'
+require 'cucumber/rake/task'
+
+module FWToolkit
+  module Rake
+    class TestTask < ::Rake::Task
+      include ::Rake::DSL if defined?(::Rake::DSL)
+      include Config
+      def initialize(&block)
+        yield self if block_given?
+        define_task
+      end
+
+
+      private
+
+      def define_task
+        namespace :test do
+
+          tasklib = Cucumber::Rake::Task.new(:frank, 'Run Frank acceptance tests')
+          task = ::Rake::Task['test:frank'] 
+          task.set_arg_names [:tags, :cucumber_options, :sim_launcher]
+          task.enhance_r do |t, args|
+            Projectfile.load! projectfile_path
+            args.with_defaults(:tags => '~@wip', :cucumber_options => '', :sim_launcher => nil)
+            ENV['APP_BUNDLE_PATH'] = File.join Dir.pwd, Projectfile.frankified_app
+            ENV['USE_SIM_LAUNCHER_SERVER'] = nil || args[:sim_launcher]
+            tasklib.cucumber_opts = "#{Projectfile.frank_root}/Features --tags=\"#{args[:tags]}\" #{args[:cucumber_options]}"
+          end
+        end
+
+        namespace :test do
+
+          desc 'Build the frankified App'
+          task :build do
+            Projectfile.load! projectfile_path
+            `frank build --workspace #{Projectfile.xcode_workspace} --scheme #{Projectfile.xcode_scheme}`
+          end
+
+          namespace :ci do
+            desc 'Run Frank acceptance tests with CI options'
+            task :frank, :tags do |t, args|
+              Projectfile.load! projectfile_path
+
+              artifacts_dir = ENV['CC_BUILD_ARTIFACTS'] || '/tmp'
+              cucumber_options = "--format pretty --format html --out '#{artifacts_dir}/frank_results.html' --format rerun --out '#{artifacts_dir}/frank_rerun.txt'"
+              ::Rake::Task['test:frank'].invoke args[:tags], cucumber_options, 'yes'
+
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fwtoolkit/rake/tasks/xcode.rb

@@ -0,0 +1,69 @@
+require 'rake'
+require 'xcodebuild'
+require 'fwtoolkit/rake/tasks/config'
+require 'fwtoolkit/projectfile'
+
+module FWToolkit
+  module Rake
+    class XcodeTask < ::Rake::Task
+      include ::Rake::DSL if defined?(::Rake::DSL)
+      include Config
+      def initialize(&block)
+        yield self if block_given?
+        define_task
+      end
+
+
+      private
+
+      def define_task
+        namespace :xcode do
+          Projectfile.load! projectfile_path
+          Config.load!
+
+          XcodeBuild::Tasks::BuildTask.new :debug do |t|
+            t.invoke_from_within = '.'
+            t.configuration = "Debug"
+            t.sdk = "iphonesimulator"
+            t.workspace = Projectfile.xcode_workspace
+            t.scheme = Projectfile.xcode_scheme
+            t.formatter = XcodeBuild::Formatters::ProgressFormatter.new
+            t.add_build_setting 'CONFIGURATION_BUILD_DIR', Config.artifacts_tmp_dir
+          end
+
+          XcodeBuild::Tasks::BuildTask.new :testing do |t|
+            t.invoke_from_within = '.'
+            t.configuration = "Debug"
+            t.sdk = "iphoneos"
+            t.workspace = Projectfile.xcode_workspace
+            t.scheme = Projectfile.xcode_scheme
+            t.formatter = XcodeBuild::Formatters::ProgressFormatter.new
+            t.add_build_setting 'CONFIGURATION_BUILD_DIR', Config.artifacts_tmp_dir
+          end
+
+          XcodeBuild::Tasks::BuildTask.new :release do |t|
+            t.invoke_from_within = '.'
+            t.configuration = "Release"
+            t.sdk = "iphoneos"
+            t.workspace = Projectfile.xcode_workspace
+            t.scheme = Projectfile.xcode_scheme
+            t.formatter = XcodeBuild::Formatters::ProgressFormatter.new
+            t.add_build_setting 'CONFIGURATION_BUILD_DIR', Config.artifacts_tmp_dir
+          end
+
+          namespace :ci do
+            XcodeBuild::Tasks::BuildTask.new :testing do |t|
+              t.invoke_from_within = '.'
+              t.configuration = "Debug"
+              t.sdk = "iphonesimulator"
+              t.workspace = Projectfile.xcode_workspace
+              t.scheme = Projectfile.xcode_scheme
+              t.formatter = XcodeBuild::Formatters::ProgressFormatter.new
+              t.add_build_setting 'CONFIGURATION_BUILD_DIR', Config.artifacts_tmp_dir
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fwtoolkit/rake/tasks.rb

@@ -0,0 +1,20 @@
+require 'fwtoolkit/rake/tasks/ci'
+require 'fwtoolkit/rake/tasks/ota'
+require 'fwtoolkit/rake/tasks/project'
+require 'fwtoolkit/rake/tasks/test'
+require 'fwtoolkit/rake/tasks/xcode'
+
+module FWToolkit
+  module Rake
+    def self.new_all(&block)
+      # Create a new rake task for each of the included/defined class that have 'Task' in their name and 
+      # belongs to FWToolkit::Rake module
+      task_classes = self.constants.select do |c|
+        constant = self.const_get(c)
+        (Class === constant) && constant.name.include?('Task')
+      end
+     task_classes.each { |k| self.const_get(k).new(&block) } 
+    end
+    
+  end
+end

data/lib/fwtoolkit/version.rb

@@ -1,3 +1,3 @@
 module FWToolkit
-  VERSION = "0.9.3"
+    VERSION = "1.0.1"
 end

data/lib/fwtoolkit.rb

@@ -1,8 +1,5 @@
-require 'erb'
-require 'rexml/document'
-require 'core_data'
+require 'fwtoolkit/ext/gem'
+require 'fwtoolkit/cli'
 
-require 'fwtoolkit/version'
-require 'fwtoolkit/test/frank_model'
-
-Dir["tasks/**/*.rake"].each { |ext| load ext } if defined?(Rake)
+module FWToolkit
+end

data/spec/git_client_spec.rb

@@ -0,0 +1,316 @@
+require 'fwtoolkit/git_client'
+require 'tmpdir'
+
+describe GitClient do
+  before do
+    @project_folder = Dir.mktmpdir
+    @repo = GitClient::Repository.new @project_folder
+    raise "Can't create temp folder" unless @project_folder
+  end
+
+  after do
+    FileUtils.rm_rf(@project_folder)
+  end
+
+  it "initialize and empty repository on an new folder" do
+    @repo.init
+    File.exists?(File.join(@project_folder, '.git')).should be_true
+  end
+
+  it "fails to initialise a repository on a folder containing a git repo" do
+    Dir.mkdir File.join(@project_folder, '.git')
+    expect { @repo.init }.to raise_error(GitClient::GitError)
+  end
+
+  it "correctly identify if a folder contains a git repository" do
+    @repo.initialized?.should be_false
+    Dir.mkdir File.join(@project_folder, '.git')
+    @repo.initialized?.should be_true
+  end
+
+  it "identifies the current branch" do
+    create_sample_repo
+    @repo.current_branch.should == 'master'
+  end
+
+  it "identifies existing and non existing branches" do
+    create_sample_repo
+    @repo.branch_exist?('master').should be_true
+    @repo.branch_exist?('deleted-branch').should be_false
+  end
+
+  it "switches to an existing different branch" do
+    create_sample_repo
+    @repo.switch_branch 'test1'
+    @repo.current_branch.should == 'test1'
+  end
+
+  it "switches to a new branch creating it" do
+    create_sample_repo
+    @repo.switch_branch 'test-new'
+    @repo.current_branch.should == 'test-new'
+  end
+
+  it "complains when switching to a non existent branch" do
+    create_empty_repo
+    expect { @repo.switch_branch 'fake_branch', false }.to raise_error GitClient::GitError
+  end
+
+  it "identifies a clean working directory" do
+    create_empty_repo
+    @repo.workdir_clean?.should == true
+    FileUtils.cd(@project_folder) { FileUtils.touch 'new_file.c' }
+    @repo.workdir_clean?.should == false
+  end
+
+  it "identifies untracked files" do
+    create_sample_repo
+    @repo.status[:untracked].include?('untracked.c').should be_true
+  end
+
+  it "identifies not up to date files on the index" do
+    create_sample_repo
+    change_the_file 'added.c'
+    @repo.status[:idx_not_up_to_date].include?('added.c').should be_true
+  end
+
+  it "identifies files added to the index" do
+    create_sample_repo
+    @repo.status[:idx_added].include?('added.c').should be_true
+  end
+
+  it "identifies files modified on the index" do
+    create_sample_repo
+    change_the_file 'added_and_committed.c'
+    add_the_file 'added_and_committed.c'
+    @repo.status[:idx_modified].include?('added_and_committed.c').should be_true
+  end
+
+  it "identifies files deleted on the index" do
+    create_sample_repo
+    remove_committed_file_from_git
+    @repo.status[:idx_deleted].include?('added_and_committed.c').should be_true
+  end
+
+  it "identifies files renamed on the index" do
+    create_sample_repo
+    move_committed_file
+    @repo.status[:idx_renamed].include?('added_and_committed.c').should be_true
+  end
+
+  it "adds files to the index" do
+    create_sample_repo
+    FileUtils.cd(@project_folder) { FileUtils.touch 'new_file.c' }
+    @repo.add_files_to_index 'new_file.c'
+    tracked_file = false
+    FileUtils.cd(@project_folder) { `git ls-files new_file.c --error-unmatch`; tracked_file = $?.success? }
+    tracked_file.should be_true
+  end
+
+  it "list all remotes when they exist" do
+    create_sample_repo
+    remotes = @repo.remotes
+    remotes[:origin].should eq 'git@github.com:/Company/repo.git'
+    remotes[:upstream].should eq 'git@github.com:/Company/cool-repo.git'
+  end
+
+  it "returns an empty remote list when none exists" do
+    create_empty_repo
+    @repo.remotes.should be_empty
+  end
+
+  it "list all submodules when they exists" do
+    create_repo_with_submodules
+    submodules = @repo.submodules
+    submodules['my_module'].should eq 'git://github.com/dummy_user/my_module.git'
+    submodules['sub/my_module2'].should eq 'git://github.com/dummy_user/my_module2.git'
+  end
+
+  it "returns an empty submodules list when none exists" do
+    create_empty_repo
+    @repo.submodules.should be_empty
+  end
+
+  it "commits to the repository" do
+    create_sample_repo
+    commit_hash = @repo.commit "My commit message"
+    valid_commit?(commit_hash).should be_true
+  end
+
+  it "merges into the current branch" do
+    create_mergable_repo
+    file_exists_in_repo?('test1_file.c').should be_false
+    @repo.merge('test1')
+    file_exists_in_repo?('test1_file.c').should be_true
+    last_commit_merge?.should be_true
+
+  end
+
+  it "merges into a specific branch" do
+    create_mergable_repo
+    file_exists_in_repo?('test1_file.c').should be_false
+    @repo.merge('test1', 'test2')
+    last_commit_merge?.should be_true
+
+    @repo.current_branch.should eq "test2"
+    file_exists_in_repo?('test1_file.c').should be_true
+  end
+
+  it "complains when trying to merge from a non existing branch" do
+    create_mergable_repo
+    expect { @repo.merge 'fake_branch' }.to raise_error GitClient::GitError
+  end
+
+  it "complains when trying to merge into a non existing branch" do
+    create_mergable_repo
+    expect { @repo.merge 'test1', 'fake_branch' }.to raise_error GitClient::GitError
+  end
+
+  it "rebases into the current branch" do
+    create_mergable_repo
+    file_exists_in_repo?('test1_file.c').should be_false
+    @repo.rebase('test1')
+    file_exists_in_repo?('test1_file.c').should be_true
+  end
+
+  it "rebases into a specific branch" do
+    create_mergable_repo
+    file_exists_in_repo?('test1_file.c').should be_false
+    @repo.rebase('test1', 'test2')
+    @repo.current_branch.should eq "test2"
+
+    file_exists_in_repo?('test1_file.c').should be_true
+  end
+
+  it "complains when trying to rebase from a non existing branch" do
+    create_mergable_repo
+    expect { @repo.rebase 'fake_branch' }.to raise_error GitClient::GitError
+  end
+
+   it "complains when trying to rebase into a non existing branch" do
+    create_mergable_repo
+    expect { @repo.rebase 'test1', 'fake_branch' }.to raise_error GitClient::GitError
+  end
+
+  it "saves the stash" do
+    create_sample_repo
+    add_the_file 'untracked.c'
+    @repo.save_stash
+    @repo.status.should be_empty
+  end
+
+  it "pops a stash" do
+    create_repo_with_stashed_data
+    @repo.workdir_clean?.should be_true
+    @repo.pop_stash
+    @repo.workdir_clean?.should be_false
+  end
+
+  private
+
+  def create_empty_repo
+    FileUtils.cd(@project_folder) do
+      `git init`
+    end
+  end
+
+  def create_sample_repo
+    create_empty_repo
+    FileUtils.cd(@project_folder) do
+      write_content_to_file 'added_and_committed.c', '//my c line'
+      write_content_to_file 'added.c', '//my c line new'
+      write_content_to_file 'untracked.c', '//my c line untracked'
+      `git add added_and_committed.c`
+      `git commit -m"My first commit"`
+      `git add added.c`
+      `git branch test1`
+      `git branch test2`
+      `git remote add origin git@github.com:/Company/repo.git`
+      `git remote add upstream git@github.com:/Company/cool-repo.git`
+    end
+  end
+
+  def create_repo_with_submodules
+    create_sample_repo
+    write_content_to_file '.gitmodules', <<-GITMODULES
+      [submodule "my_module"]
+          path = my_module
+          url = "git://github.com/dummy_user/my_module.git"
+      [submodule "my_module2"]
+          path = sub/my_module2
+          url = "git://github.com/dummy_user/my_module2.git"
+      GITMODULES
+  end
+
+  def create_mergable_repo
+    create_empty_repo
+    FileUtils.cd(@project_folder) do
+      FileUtils.touch('master_file.c')
+      `git add .`
+      `git commit -m"First Commit"`
+      `git checkout -b test1 2>&1`
+      `git branch test2`
+      write_content_to_file 'test1_file.c', '//my c line on test1'
+      `git add test1_file.c`
+      `git commit -m "Test1 branchs commit"`
+      `git checkout master 2>&1`
+    end
+  end
+
+  def create_repo_with_stashed_data
+    create_sample_repo
+    add_the_file 'untracked.c'
+    FileUtils.cd(@project_folder) do
+      `git stash save`
+    end
+  end
+
+  def write_content_to_file(filename, content)
+    FileUtils.cd(@project_folder) do
+       File.open(filename, 'w') {|f| f.write(content) }
+    end
+  end
+
+  def change_the_file(filename)
+    write_content_to_file(filename,'//another c line')
+  end
+
+  def add_the_file(filename)
+    FileUtils.cd(@project_folder) do
+      `git add #{filename}`
+    end
+  end
+
+  def remove_committed_file_from_git
+    FileUtils.cd(@project_folder) do
+      `git rm added_and_committed.c`
+    end
+  end
+
+  def move_committed_file
+    FileUtils.cd(@project_folder) do
+      FileUtils.mv('added_and_committed.c', 'moved.c')
+      `git rm added_and_committed.c`
+      `git add moved.c`
+    end
+  end
+
+  def valid_commit?(sha1)
+     FileUtils.cd(@project_folder) do
+       `git merge-base #{sha1} master`
+     end
+     $?.success?
+  end
+
+  def last_commit_merge?
+    last_commit_sha = nil
+    FileUtils.cd(@project_folder) do
+      last_commit_sha = `git rev-list --merges HEAD~1..HEAD`
+    end
+    $?.success? &&  last_commit_sha && last_commit_sha.length > 0
+  end
+
+  def file_exists_in_repo?(filename)
+    File.exists? File.join(@project_folder, filename)
+  end
+end

data/spec/project_config_spec.rb

@@ -0,0 +1,40 @@
+require 'fwtoolkit/projectfile'
+require 'support/project_generator'
+
+describe "FWToolkit::Project" do
+  
+  class DummyClass
+  end
+
+  let!(:project) { ProjectGenerator.new }
+  let(:project_folder) { project.project_folder }
+  let(:project_class) { DummyClass.new }
+  
+  before(:each) do
+    @project_class.extend FWToolkit::Projectfile
+  end
+
+  after(:each) do
+    FileUtils.rm_rf(project_folder)
+  end
+
+  it "correctly parses a full projectfile" do
+    project.create_test_project ProjectGenerator::PRJFILE_COMPLETE_CONFIG
+    FWToolkit::Projectfile.load! project_folder
+    FWToolkit::Projectfile.config.should == ProjectGenerator::PRJFILE_COMPLETE_CONFIG 
+  end
+
+  it "correctly adds defaults to an incomplete projectfile" do
+    project.create_test_project ProjectGenerator::PRJFILE_STANDARD_CONFIG
+    FWToolkit::Projectfile.load! project_folder
+    FWToolkit::Projectfile.config.should == ProjectGenerator::PRJFILE_COMPLETE_CONFIG
+  end
+
+  it "raises an exception if the minimal config is not specified" do
+    invalid_config = ProjectGenerator::PRJFILE_COMPLETE_CONFIG.clone
+    invalid_config.delete(:project_name)
+
+    project.create_test_project invalid_config
+    expect { FWToolkit::Projectfile.load! project_folder }.to raise_error(NameError)
+  end
+end